Merge branch 'release/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Apr 2017 18:32:12 +0000 (14:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Apr 2017 18:32:12 +0000 (14:32 -0400)

Trivial merge