1.0dev: merged [11233] from 0.12-stable
Authored by: jomae 2012-08-31
Parent: [r11233]
Child: [r11235]