Merge pull request #4713 from colemanw/CRM-15710