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