Summary of changes: 0d9f993... 2.5.5 (*) (*) This commit already existed in another branch; no separate mail sent