Merge branch 'release/1.0.4' master v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Wed, 17 Apr 2019 17:45:41 +0000 (13:45 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 17 Apr 2019 17:45:41 +0000 (13:45 -0400)

Trivial merge