Merge pull request #986 from deepak-srivastava/ninja