Merge branch 'release/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 12 Mar 2018 19:06:33 +0000 (15:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 12 Mar 2018 19:06:33 +0000 (15:06 -0400)

Trivial merge