Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Feb 2017 21:47:28 +0000 (16:47 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Feb 2017 21:47:28 +0000 (16:47 -0500)

Trivial merge