fix 1528
Merge commit 'zk1528' into zkoss-master