Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 13 Jun 2018 20:40:14 +0000 (16:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 13 Jun 2018 20:40:14 +0000 (16:40 -0400)

Trivial merge