Merge branch 'release/1.2.31' v1.2.31
authorLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 17:04:52 +0000 (12:04 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 17:04:52 +0000 (12:04 -0500)

Trivial merge