Merge branch 'release/1.0.0' v1.0.0
authorLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 15:52:11 +0000 (11:52 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 15:52:11 +0000 (11:52 -0400)

Trivial merge