tests; fix comment
website; note about keepAlive
Merge branch '3.6.x' into gh-pages
website; regen for keepAlive