Merge branch 'master' into ninja-order-only-fix

15 jobs for ninja-order-only-fix