apropos.html
Merge branch 'master' into gh-pages

Conflicts:
	apropos.html