Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Sep 2018 13:08:40 +0000 (09:08 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Sep 2018 13:08:40 +0000 (09:08 -0400)

Trivial merge