Synchronize with trunk's revision r57652.