Summary of changes: 6669555... Improve detection of comment marker in configuration file (*) ff0a129... Merge branch 'master' into el6 (*) This commit already existed in another branch; no separate mail sent