Summary of changes: 17f12e5... added various upstream patches (*) 62f9433... Merge branch 'master' into el6 (*) This commit already existed in another branch; no separate mail sent