Merge upstream to r133163 at Fri. 17th Jun 2011.