Summary of changes: 8e1f898... fix changelog (*) 31fdfbd... Update to latest upstream version. (*) 179b414... Merge branch 'master' into f18 (*) This commit already existed in another branch; no separate mail sent