Fixed for DE80
Merge branch 'master' of https://github.com/Det-Kongelige-Bibliotek/valhal
Merge remote-tracking branch 'origin/master' into version_upgrade
Merge branch 'version_upgrade' of https://github.com/Det-Kongelige-Bibliotek/valhal into version_upgrade