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