bug96 fixed
Merge branch 'master' into v1.7

Conflicts:
	splash/contacts.html
	splash/index.html