README shortened
automerge master into master-experimental