Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Fri, 3 Nov 2017 21:08:00 +0000 (17:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 3 Nov 2017 21:08:00 +0000 (17:08 -0400)

Trivial merge