Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 19:08:35 +0000 (15:08 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 19:08:35 +0000 (15:08 -0400)

Trivial merge