Summary of changes: 907930f... New upstream release 2.0.4 and sync (*) 22f97b6... Amendment to changelog (*) (*) This commit already existed in another branch; no separate mail sent