Fixes #881
Merge remote-tracking branch 'upstream/master'

Not bad, but has some flaws.

Conflicts:
	zp-core/admin-edit.php
	zp-core/admin-functions.php