website; add deep links
website; update faq
Merge branch '3.6.x' into gh-pages
website; regen