Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Jun 2018 12:52:09 +0000 (08:52 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Jun 2018 12:52:09 +0000 (08:52 -0400)

Trivial merge