Merge "setup.cfg: Replace dashes by underscores"