Merge branch 'release/1.0.0' v1.0.0
authorLaury GvR <laury@gaslightmedia.com>
Tue, 15 Aug 2017 17:31:48 +0000 (13:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 15 Aug 2017 17:31:48 +0000 (13:31 -0400)

Trivial merge