Merge another trunk change.

FossilOrigin-Name: 2648966f17bc1b783ef6d3b2368c613f6e02945e