Summary of changes: 639dca5... add upstream commits patch (*) b82ed6e... clean up commits patch (*) 889b63a... Merge branch 'master' into f17 (*) This commit already existed in another branch; no separate mail sent