CRM-12772
Merge pull request #986 from deepak-srivastava/ninja

CRM-12772