User lost port and country.
Merge branch 'master' of https://github.com/VikingOrg/viking.git