Summary of changes: f55fefe... 7.18 (*) (*) This commit already existed in another branch; no separate mail sent