Amin Bandali writes: > I'll review and merge Stefan's patch once he sends it. See attached.