Synchronize with trunk up to r133241