Merge branch 'hotfix/1.1.32'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 19:17:10 +0000 (15:17 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 19:17:10 +0000 (15:17 -0400)

Trivial merge