Merge branch 'release/1.0.0' v1.0.0
authorLaury GvR <laury@gaslightmedia.com>
Thu, 26 May 2016 18:53:31 +0000 (14:53 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 26 May 2016 18:53:31 +0000 (14:53 -0400)

Trivial merge