Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 25 Oct 2016 13:09:36 +0000 (09:09 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 25 Oct 2016 13:09:36 +0000 (09:09 -0400)

Trivial merge