Merge branch 'release/1.0.0' v1.0.0
authorLaury GvR <laury@gaslightmedia.com>
Fri, 19 Feb 2016 21:25:20 +0000 (16:25 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 19 Feb 2016 21:25:20 +0000 (16:25 -0500)

Trivial merge