Merge branch 'release/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Nov 2017 17:47:46 +0000 (12:47 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Nov 2017 17:47:46 +0000 (12:47 -0500)

Trivial merge