manual anoncvs update
Merge branch 'master' into master-experimental