Merge branch 'release/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jun 2018 16:37:38 +0000 (12:37 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jun 2018 16:37:38 +0000 (12:37 -0400)

Trivial merge