Merge branch 'hotfix/1.1.31' V1.1.31
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:24:42 +0000 (09:24 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:24:42 +0000 (09:24 -0400)

Trivial merge