update from anoncvs
delete reverted patch
Merge branch 'master' into master-experimental