Merge branch 'hotfix/1.0.31' v1.0.31
authorLaury GvR <laury@gaslightmedia.com>
Mon, 4 Apr 2016 17:11:27 +0000 (13:11 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 4 Apr 2016 17:11:27 +0000 (13:11 -0400)

Trivial merge