Double sanitizes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	zp-core/zp-extensions/zenpage/admin-edit.php

	modified:   zp-core/zp-extensions/seo_cleanup.php
	modified:   zp-core/zp-extensions/zenpage/admin-edit.php