Merge branch 'upstream/master'

Conflicts resolved:
	TOC.html
Merge branch 'origin/review'