now working on 3.6.18
website; update guide
Merge branch '3.6.x' into gh-pages
website; regen