Adapted the branch to the new master code. Now it's working like
before merge.
Make countries fit to ISO country codes (ISO 3166). If there is no
configuration about countries, the list of possible countries will be
all the ISO countries listed in pycountry.