Merge branch 'release/1.0.42' v1.0.42
authorLaury GvR <laury@gaslightmedia.com>
Wed, 21 Nov 2018 14:46:06 +0000 (09:46 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 21 Nov 2018 14:46:06 +0000 (09:46 -0500)

Trivial merge