Merge master branch with 10.1.1 for next release.

According to to my screen, branch 10.1.1 is 57 commits behind master which would potentially mean that none of the new bug fixes will be in the release.