Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 17 Jan 2018 13:02:47 +0000 (08:02 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 17 Jan 2018 13:02:47 +0000 (08:02 -0500)

Trivial merge