Merge master into 2.0.x release branch
This PR merges the latest changes from master
onto the 2.0.x release branch, in preparation for the 2.0.1 release.
This PR merges the latest changes from master
onto the 2.0.x release branch, in preparation for the 2.0.1 release.