Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 11 Oct 2018 15:27:28 +0000 (11:27 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 11 Oct 2018 15:27:28 +0000 (11:27 -0400)

Trivial merge