Merge commit feb5039e (no conflict)

7 jobs for 1363 in 19 minutes and 47 seconds (queued for 4 seconds)