1.0dev: Merged [11113] from 0.12-stable
Authored by: jomae 2012-07-15
Parent: [r11113]
Child: [r11115]