Merge branch 'hotfix/1.2.42' v1.2.42
authorLaury GvR <laury@gaslightmedia.com>
Wed, 22 Nov 2017 20:15:10 +0000 (15:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 22 Nov 2017 20:15:10 +0000 (15:15 -0500)

Trivial merge