Merge branch 'release/1.0.0' v1.0.0
authorLaury GvR <laury@gaslightmedia.com>
Wed, 10 May 2017 17:37:01 +0000 (13:37 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 10 May 2017 17:37:01 +0000 (13:37 -0400)

Trivial merge