Merge latest trunk changes.

FossilOrigin-Name: 4d7057c4942464b4302031a1ee9f195700c5e66d