Merge metadata changes from upstream r656
Generated Python files for metadata
Prep for 6.1.0 release
PEP8 fixes
Merge code changes from upstream r656
Cope with missing international_prefix