Fix the version #
Merge remote-tracking branch 'origin/master' into 1.4.6

Conflicts:
	zp-core/version.php