2.0.0 pre-release merge

This incorporates one late fix and some documentation improvements, plus the bump to the version in the Changelog.