Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Tue, 31 Oct 2017 18:48:33 +0000 (14:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 31 Oct 2017 18:48:33 +0000 (14:48 -0400)

Trivial merge