Update for RC1
Merge branch '1.0' into gh-pages