Merged r12139, r12140 and r12141 from trunk to 2.3-stable (#14931)
Authored by: tmaruyama 2013-09-18
Parent: [r12143]
Child: [r12145]