Summary of changes: 5de1b51... backport a few upstream fixes, in particular... (*) 02c927e... +changelog (*) (*) This commit already existed in another branch; no separate mail sent