Synchronize with trunk's revision r57659.