Summary of changes: 14f3773... 6.1 (*) (*) This commit already existed in another branch; no separate mail sent