Merge branch 'master' into internal_stylesheet

Conflicts:
	iidtutor.html [resolved]
Merge branch 'internal_stylesheet'

* internal_stylesheet:

Conflicts:
	iidtutor.html