Summary of changes: ecf949b... New upstream version: dec970f (*) d24102e... merge from f18 (*) This commit already existed in another branch; no separate mail sent