fix #239

also required:
d7a288b8d96f1b8d763591f9f95548940d9773ff
34df51cd5cfa6ce4aaa474930b2706eeebdfe3d8
release id bf2e07e8cf
Merge remote-tracking branch 'origin/master' into 1.4.5

Conflicts:
	zp-core/template-functions.php

	modified:   zp-core/githead
	modified:   zp-core/template-functions.php