fix ZK-2022 cause B36-1968616 endless issue
minor fix
Fix bug ZK-2033
http://tracker.zkoss.org/browse/ZK-2033
Merge branch 'master' of github.com:zkoss/zk