Merged r10893 into 2.1-stable (#12472).
Authored by: jplang 2012-11-30
Parent: [r10894]
Child: [r10896]