Merge branch 'hotfix/1.1.42' v1.1.42
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 22 Mar 2018 20:29:27 +0000 (16:29 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 22 Mar 2018 20:29:27 +0000 (16:29 -0400)

Trivial merge