Merge branch 'release/1.0.0'
authorLaury GvR <laury@gaslightmedia.com>
Mon, 16 Nov 2015 14:27:55 +0000 (09:27 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 16 Nov 2015 14:27:55 +0000 (09:27 -0500)

Trivial merge