Merge branch 'hotfix/1.0.15' v1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Wed, 6 Sep 2017 12:44:45 +0000 (08:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 6 Sep 2017 12:44:45 +0000 (08:44 -0400)

Trivial merge