Merge branch 'release/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Tue, 13 Mar 2018 20:51:02 +0000 (16:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 13 Mar 2018 20:51:02 +0000 (16:51 -0400)

Trivial merge