[1.5] Import patch suggested in bug #241