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

Trivial merge