sync with CVS
Merge branch 'master' into filter