Merged r10893 into 1.4-stable (#12472).
Authored by: jplang 2012-11-30
Parent: [r10895]
Child: [r10897]
