Merged r10948 into 2.2-stable (#3447).
Authored by: jplang 2012-12-08
Parent: [r10951]
Child: [r10953]