Merge branch 'release/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Wed, 16 Aug 2017 13:28:47 +0000 (09:28 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 16 Aug 2017 13:28:47 +0000 (09:28 -0400)

Trivial merge