Merge pull request #4153 from davecivicrm/CRM-15197g