Merge remote-tracking branch 'nexedi/master' into fix/pickles

3 jobs for fix/pickles
in 0 seconds, using 0 compute credits, and was queued for 0 seconds