Merge branch 'release4.16.0' into develop

Conflicts:
	installer.xml