Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Wed, 10 Feb 2016 15:57:44 +0000 (10:57 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 10 Feb 2016 15:57:44 +0000 (10:57 -0500)

Trivial merge