Merged r11737 and r11738 from trunk to 2.3-stable (#13823)
Authored by: tmaruyama 2013-04-21
Parent: [r11738]
Child: [r11740]
