Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 5 Apr 2018 13:49:28 +0000 (09:49 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 5 Apr 2018 13:49:28 +0000 (09:49 -0400)

Trivial merge