Final tweaks for 1.0
Merge branch 'release/1.0'