revert 1551
Merge remote-tracking branch 'zkoss/master' into zkoss-master