Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Mon, 21 Aug 2017 16:24:28 +0000 (12:24 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 21 Aug 2017 16:24:28 +0000 (12:24 -0400)

Trivial merge