Merge latest trunk changes.

FossilOrigin-Name: 24aa20da222a9cc181473bc41d0f8791be91fa97