Merge branch 'release/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Mar 2017 20:17:49 +0000 (16:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Mar 2017 20:17:49 +0000 (16:17 -0400)

Trivial merge