Merge branch 'master' into local-images

Conflicts:
	index.html