Summary of changes: 8d85798... Update to 2.0.5 (#1124151) (*) a161d80... Revert "Merge fix" 5f7d842... Merge branch 'master' into f20 (*) This commit already existed in another branch; no separate mail sent