1.0dev: merged [11192] from 0.12-stable
Authored by: jomae 2012-08-07
Parent: [r11192]
Child: [r11194]