Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 31 Oct 2016 14:55:46 +0000 (10:55 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 31 Oct 2016 14:55:46 +0000 (10:55 -0400)

Trivial merge