Merged r10840 from trunk to 1.4-stable
Authored by: tmaruyama 2012-11-18
Parent: [r10848]
Child: [r10850]