Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Thu, 14 Jun 2018 20:22:12 +0000 (16:22 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 14 Jun 2018 20:22:12 +0000 (16:22 -0400)

Trivial merge