1.1.1dev: Merged [11547] from 1.0-stable.
Authored by: rblank 2013-01-26
Parent: [r11557]
Child: [r11559]