Summary of changes: 2c96f98... 4.8.4 (*) (*) This commit already existed in another branch; no separate mail sent