Merge branch 'hotfix/1.0.48' v1.0.48
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 13 Aug 2018 19:32:25 +0000 (15:32 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 13 Aug 2018 19:32:25 +0000 (15:32 -0400)

Trivial merge