Merge branch 'hotfix/1.0.4' master v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 31 Jul 2018 13:22:34 +0000 (09:22 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 31 Jul 2018 13:22:34 +0000 (09:22 -0400)

Trivial merge