Merge pull request #702 from eileenmcnaughton/CRM-12584