Merge pull request #4688 from colemanw/CRM-15495