Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Mon, 4 Jan 2016 21:06:13 +0000 (16:06 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 4 Jan 2016 21:06:13 +0000 (16:06 -0500)

Trivial merge