Merge branch 'hotfix/1.1.31'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 16:57:03 +0000 (12:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 16:57:03 +0000 (12:57 -0400)

Trivial merge