-- Fix for test failure
Merge pull request #515 from NileemaJadhav/HR-12-check

-- Fix for test failure
Merge pull request #520 from civicrm/1.2

Merge branch 1.2 into master