Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 May 2018 18:58:43 +0000 (14:58 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 May 2018 18:58:43 +0000 (14:58 -0400)

Trivial merge