Re-fix bug ZK-868
Merge branch 'master' of github.com:zkoss/zk