Merge r11675 from 1.0-stable (#11045)
Authored by: cboos 2013-02-03
Parent: [r11681]
Child: [r11683]