Merge in the latest changes from trunk.

FossilOrigin-Name: c78b0d302c6908ad5bf75a4f6fb77d1a0b3e8a76