Fix undefined variable
Merge pull request #536 from colemanw/quickFix

Fix undefined variable
Merge pull request #532 from deepak-srivastava/ninja

Fix for CRM-12409