1.1.2dev: merged [12468] from 1.0-stable (fix for #11462)
Authored by: jomae 2014-01-28
Parent: [r12468]