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

Trivial merge