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