Merge branch 'hotfix/1.0.31' v1.0.31
authorLaury GvR <laury@gaslightmedia.com>
Tue, 6 Dec 2016 15:20:03 +0000 (10:20 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 6 Dec 2016 15:20:03 +0000 (10:20 -0500)

Trivial merge