phony
website; clean up homepage
Merge branch '3.6.x' into gh-pages
website; regen