Various updates
Merge branch 'master' into modularize_menu

Conflicts:
	docs/css/docs.css