Merge branch 'release/1.0.4' master v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 28 Oct 2019 18:00:26 +0000 (14:00 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 28 Oct 2019 18:00:26 +0000 (14:00 -0400)

Trivial merge