Merge branch 'hotfix/1.0.42' v1.0.42
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 2 Oct 2017 15:48:54 +0000 (11:48 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 2 Oct 2017 15:48:54 +0000 (11:48 -0400)

Trivial merge