Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Thu, 14 Jun 2018 21:25:41 +0000 (17:25 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 14 Jun 2018 21:25:41 +0000 (17:25 -0400)

Trivial merge