Merge 2.10.x into master

Last merge of 2.10.x branch before 2.11.0-M5 release.

Review by @retronym who contributed majority of commits being merged here.