Merge in the latest changes from trunk.

FossilOrigin-Name: 66c4aaadda433c9d479a25c27cdff84560088402