fix #272
release id 009e0ca79c
Merge remote-tracking branch 'origin/master' into 1.4.5

Conflicts:
	zp-core/admin-plugins.php