Merge branch 'bibarchive-extra-bf' into bibarchive-extra