Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 8 May 2017 15:06:03 +0000 (11:06 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 8 May 2017 15:06:03 +0000 (11:06 -0400)

Trivial merge