Merge branch 'v3.0' into gh-pages fix for #10