merge master

5 jobs for better_minimizers in 25 minutes and 15 seconds