Merge "Don't use deprecated configparser.readfp"