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

Trivial merge