Merge branch 'hotfix/1.2.31' v1.2.31
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Dec 2016 15:06:11 +0000 (10:06 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Dec 2016 15:06:11 +0000 (10:06 -0500)

Trivial merge