Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 21 Apr 2017 12:13:24 +0000 (08:13 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 21 Apr 2017 12:13:24 +0000 (08:13 -0400)

Trivial merge