Merge pull request #15012 from neheb/ninja