Merge branch 'hotfix/1.1.33'
authorLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jul 2016 17:00:23 +0000 (13:00 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jul 2016 17:00:23 +0000 (13:00 -0400)

Trivial merge