BibArchive: Ported for master