Fix #858
Merge remote-tracking branch 'upstream/master' into upstream

Conflicts:
	zp-core/zp-extensions/comment_form/admin-comments.php