Synchronize with trunk up to r132940