Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Jun 2017 13:39:46 +0000 (09:39 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Jun 2017 13:39:46 +0000 (09:39 -0400)

Trivial merge