Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Fri, 1 Jun 2018 19:34:34 +0000 (15:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 1 Jun 2018 19:34:34 +0000 (15:34 -0400)

Trivial merge