Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 24 Aug 2017 12:41:58 +0000 (08:41 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 24 Aug 2017 12:41:58 +0000 (08:41 -0400)

Trivial merge