Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 6 Aug 2018 12:36:34 +0000 (08:36 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 6 Aug 2018 12:36:34 +0000 (08:36 -0400)

Trivial merge