Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 11 Jul 2017 17:17:16 +0000 (13:17 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 11 Jul 2017 17:17:16 +0000 (13:17 -0400)

Trivial merge