Merge branch 'release/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Mar 2018 14:35:44 +0000 (09:35 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Mar 2018 14:35:44 +0000 (09:35 -0500)

Trivial merge