docs; querystream options
Merge branch 'master' into gh-pages
website; regen