Merge branch 'release/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 18 May 2017 13:15:21 +0000 (09:15 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 18 May 2017 13:15:21 +0000 (09:15 -0400)

Trivial merge