merge master

4 jobs for better_minimizers in 18 minutes and 40 seconds (queued for 1 second)