Merge branch 'release/1.0.4' master v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 22 May 2019 12:10:58 +0000 (08:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 22 May 2019 12:10:58 +0000 (08:10 -0400)

Trivial merge