Merge "setup.cfg: Replace dashes with underscores"