Merge pull request #1073 from ninja-build/manual-font