Manually merge r60521 from trunk.
1 file changed