Merge branch 'hotfix/1.0.15' v1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 14:45:13 +0000 (10:45 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 14:45:13 +0000 (10:45 -0400)

Trivial merge