Should fix #880
Please revert if this is not correct.
This reverts the previous fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	zp-core/zp-extensions/zenpage/class-news.php