Synchronize with trunk up to r133240