Merge tag 'v1.1.15' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Apr 2015 18:24:35 +0000 (14:24 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Apr 2015 18:24:35 +0000 (14:24 -0400)
v1.1.15


Trivial merge