Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Jun 2017 15:24:33 +0000 (11:24 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Jun 2017 15:24:33 +0000 (11:24 -0400)

Trivial merge