1.0.2dev: merge [11851] to 1.0-stable (fix for #11248).
Authored by: rjollos 2013-07-22
Parent: [r11851]
Child: [r11853]