Summary of changes: a51ad6b... Accidentally forgotten patches added back (*) e98e482... Merge branch 'master' into f14/master (*) This commit already existed in another branch; no separate mail sent