CRM-12213
CRM-12213
Merge pull request #255 from deepak-srivastava/ninja

Fix for CRM-12213