Merge all changes from 1.10 branch into master

Deleting the v1.10 branch and merging all changes back into the Master
branch for simplicity. Note: this does not yet mark the v1.10 release.