Untested solution to https://sbprojects.statsbiblioteket.dk/jira/browse/BTA-17https://sbprojects.statsbiblioteket.dk/jira/browse/BTA-17
Merge remote-tracking branch 'origin/master'