Merge branch 'release/1.2.31' master v1.2.31
authorLaury GvR <laury@gaslightmedia.com>
Mon, 26 Nov 2018 20:04:56 +0000 (15:04 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 26 Nov 2018 20:04:56 +0000 (15:04 -0500)

Trivial merge