Merge 2.10.x to master

A no-op merge; only backports and build updates on the
2.10.x branch.