Merge branch '3.8.x' into gh-pages

Conflicts:
	History.md
	package.json
website; regen: 3.8.2