Merge updates from trunk.

FossilOrigin-Name: a88b5be01e68b26267ff6eb05e931ef2e7fc9f99