Merge branch 'release/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 17:58:15 +0000 (13:58 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 17:58:15 +0000 (13:58 -0400)

Trivial merge