Merge branch 'hotfix/1.0.47' v1.0.47
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 13 Aug 2018 18:20:28 +0000 (14:20 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 13 Aug 2018 18:20:28 +0000 (14:20 -0400)

Trivial merge