Merge commit 'biblibre/3.2_biblibre' into to-push