Summary of changes: 871014a... Patches to fix more config parsing errors (#703960 #706218) (*) 29d71ce... Use the right patches (*) b9a7c1c... Re-add good patch file (*) 8a9aa0b... Merge branch 'master' into f14 (*) This commit already existed in another branch; no separate mail sent