Merge branch 'hotfix/1.2.42' v1.2.42
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Nov 2018 18:15:13 +0000 (13:15 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Nov 2018 18:15:13 +0000 (13:15 -0500)

Trivial merge