Synchronize up to trunk's revision r57784.