release id b3d1e7a246
RC3
Merge remote-tracking branch 'origin/master'

Conflicts:
	zp-core/githead

	deleted:    zp-core/githead
release id 13ef04da59