Merge pull request #1067 from deepak-srivastava/ninja