Merged r12146, r12147 and r12148 from trunk to 2.3-stable (#14931)
Authored by: tmaruyama 2013-09-18
Parent: [r12150]
Child: [r12152]