fine tune ZK-1733
Merge branch 'master' of github.com:zkoss/zk