1.1.2dev: merged [12462] from 1.0-stable (fix for #11438)
Authored by: jomae 2014-01-20
Parent: [r12462]
Child: [r12464]