Merged with trunk R1311.