Summary of changes: f846c38... upstream patch for upstream bug #838/#839/#840 (*) ad174a5... upstream patch for upstream bug #838/#839/#840 (with patch) (*) (*) This commit already existed in another branch; no separate mail sent