Merge r60522 from trunk.
1 file changed