Summary of changes: 97a91c2... Drop previous patch, in wider testing it breaks more than i (*) 0896483... Merge branch 'master' into f15 (*) This commit already existed in another branch; no separate mail sent