Summary of changes: 5e6585b... 4.9.4 (*) (*) This commit already existed in another branch; no separate mail sent