Merged changeset 85793 from trunk.