CRM-12951
Merge pull request #1067 from deepak-srivastava/ninja

CRM-12951