Summary of changes: 6a71f49... Apply the previous workaround unconditionally# Please enter (*) da7ec9c... Merge branch 'master' into f16 (*) This commit already existed in another branch; no separate mail sent