Merged r12265, r12268, r12272 (#15307).
Authored by: jplang 2013-11-16
Parent: [r12281]
Child: [r12283]