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