Merge branch 'release/1.0.0' v1.0.0
authorLaury GvR <laury@gaslightmedia.com>
Thu, 28 Apr 2016 13:31:17 +0000 (09:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 28 Apr 2016 13:31:17 +0000 (09:31 -0400)

Trivial merge