Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 18:42:13 +0000 (14:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 18:42:13 +0000 (14:42 -0400)

Trivial merge