CRM-12803
Merge pull request #1008 from deepak-srivastava/ninja

CRM-12803