derp, no s on that url
Merge branch '3.0.0-wip' into gh-pages