Merged r11599, r11600, r11601 from trunk to 2.3-stable (#13438)
Authored by: tmaruyama 2013-03-12
Parent: [r11601]
Child: [r11603]