Merge r60528, r60534 and r60539 from trunk.
1 file changed