Merge branch 'hotfix/1.0.15' v1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Fri, 30 Jun 2017 18:53:21 +0000 (14:53 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 30 Jun 2017 18:53:21 +0000 (14:53 -0400)

Trivial merge