Merge branch 'hotfix/1.0.32' v1.0.32
authorLaury GvR <laury@gaslightmedia.com>
Mon, 4 Apr 2016 17:15:25 +0000 (13:15 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 4 Apr 2016 17:15:25 +0000 (13:15 -0400)

Trivial merge