Fix for CRM-12409
Merge pull request #532 from deepak-srivastava/ninja

Fix for CRM-12409