Merge branch 'release/1.0.0' v1.0.0
authorLaury GvR <laury@gaslightmedia.com>
Fri, 15 Apr 2016 21:13:48 +0000 (17:13 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 15 Apr 2016 21:13:48 +0000 (17:13 -0400)

Trivial merge