Synchronize with trunk's revision r57629.