Merge branch 'hotfix/1.0.4' master v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 6 Jun 2018 20:41:29 +0000 (16:41 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 6 Jun 2018 20:41:29 +0000 (16:41 -0400)

Trivial merge