Merge in all the latest trunk changes.

FossilOrigin-Name: 45cdc32f1e4d33959108dac94f551a4b8030424d