Merge commit 'koha-biblibre/master' into bl-acq