Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Wed, 24 Oct 2018 21:42:10 +0000 (17:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 24 Oct 2018 21:42:10 +0000 (17:42 -0400)

Trivial merge