Merge branch 'hotfix/1.1.33' v1.1.33
authorLaury GvR <laury@gaslightmedia.com>
Mon, 13 Nov 2017 19:24:30 +0000 (14:24 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 13 Nov 2017 19:24:30 +0000 (14:24 -0500)

Trivial merge