Merge branch 'ZTal-1.4' into develop

Conflicts:
	CHANGELOG
Merge branch 'master' into develop

Conflicts:
	CHANGELOG