Merge remote-tracking branch 'origin/master'

Conflicts:
	zkdoc/release-note