Merge !326: various nitpicks

5 jobs for master
in 76 minutes and 49 seconds and was queued for 0 seconds
Scheduled