Merge master branch with 10.1.1 ready for next release.