Merge branch 'hotfix/1.0.33'
authorLaury GvR <laury@gaslightmedia.com>
Mon, 4 Apr 2016 18:16:08 +0000 (14:16 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 4 Apr 2016 18:16:08 +0000 (14:16 -0400)

Trivial merge