Bring changeset 11301 to the branch from the trunk.

No match.