Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Jun 2018 14:47:27 +0000 (10:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Jun 2018 14:47:27 +0000 (10:47 -0400)

Trivial merge