CRM-12641
Merge pull request #776 from deepak-srivastava/ninja

CRM-12641