Merged r10253, r10257, r10263 and r10264 from trunk to 2.0-stable
Authored by: tmaruyama 2012-09-01
Parent: [r10266]
Child: [r10268]