Fine tune bug ZK-1706
Merge branch 'master' of github.com:zkoss/zk