Merge trunk changes.

FossilOrigin-Name: c6ac80ed8d5240dd30783d62d9f133e159809dec