1.0.2dev: merge from 0.12-stable (fix for #11194)
Authored by: jomae 2013-06-01
Parent: [r11807]
Child: [r11809]