applied patch for CRM-12705
Merge pull request #8 from eileenmcnaughton/4.2

applied patch for CRM-12705