v3.0-rc
Merge branch 'gh-pages' into v3.0