Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Mon, 9 Mar 2015 14:24:16 +0000 (10:24 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 9 Mar 2015 14:24:16 +0000 (10:24 -0400)

Trivial merge