Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Feb 2018 15:57:08 +0000 (10:57 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Feb 2018 15:57:08 +0000 (10:57 -0500)

Trivial merge