Lisbon shortname fix
Merge branch 'master' of github.com:guardian/frontend into lisbon-shortname-fix
Merge pull request #6010 from guardian/lisbon-shortname-fix

Lisbon shortname fix