Merge branch 'release/1.0.4' v1.0.4
authorlaury <laury@gaslightmedia.com>
Thu, 28 Sep 2017 13:43:58 +0000 (09:43 -0400)
committerlaury <laury@gaslightmedia.com>
Thu, 28 Sep 2017 13:43:58 +0000 (09:43 -0400)

Trivial merge