1.1.1dev: merged r11509 (#11017) from 1.0-stable.
Authored by: cboos 2013-01-17
Parent: [r11525]
Child: [r11527]