1.1.2dev: merge [11816] from 1.0-stable
Authored by: jomae 2013-06-10
Parent: [r11816]
Child: [r11818]