Merge branch 'hotfix/1.0.15' v1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Tue, 8 Jan 2019 15:37:35 +0000 (10:37 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 8 Jan 2019 15:37:35 +0000 (10:37 -0500)

Trivial merge