Merge branch 'release/1.0.4' v1.0.4
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 21 Jun 2018 18:17:17 +0000 (14:17 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 21 Jun 2018 18:17:17 +0000 (14:17 -0400)

Trivial merge