Merge pull request #864 from eileenmcnaughton/CRM-12160