Merge branch 'release/1.0.4' master v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Fri, 16 Nov 2018 17:14:12 +0000 (12:14 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 16 Nov 2018 17:14:12 +0000 (12:14 -0500)

Trivial merge