WIP: Forwarded PR: ninja #2

Draft
adamm wants to merge 1 commits from PR_ninja#1 into master

2
ninja

Submodule ninja updated: 46d29ee933...a5ad684920