Summary of changes: 85dc5af... 3.2.5 (*) (*) This commit already existed in another branch; no separate mail sent