Settings in sync with mainline
Minor changes to README.rst