Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Mar 2016 17:43:27 +0000 (12:43 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Mar 2016 17:43:27 +0000 (12:43 -0500)

Trivial merge