Merged r11728, r11729, r11730, r11731, r11732 and r11733 from trunk to 2.3-stable (#13811)
Authored by: tmaruyama 2013-04-20
Parent: [r11733]
Child: [r11735]