Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Jun 2016 19:26:43 +0000 (15:26 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Jun 2016 19:26:43 +0000 (15:26 -0400)

Trivial merge