Merge branch 'no-local-biblio' into build-script/improved-code-blocks