1.1.1dev: Merged from 1.0-stable (fix for #10828)
Authored by: psuter 2013-01-06
Parent: [r11484]
Child: [r11486]