follow-ups from https://sbforge.org/fisheye/cru/CR-NEWSPAPER-76 / https://sbprojects.statsbiblioteket.dk/jira/browse/AVISIMPL-213
Merge remote-tracking branch 'origin/master'