1.1.2dev: merged [12453] from 1.0-stable (fix for #11450)
Authored by: jomae 2014-01-19
Parent: [r12453]
Child: [r12455]