1.0dev: merged [11288] from 0.12-stable
Authored by: jomae 2012-09-06
Parent: [r11288]
Child: [r11290]