Update maintenance/1.9.x to current master

This is as much a test as anything else. There is still work to be done in master.