Merge pull request #3731 from davecivicrm/CRM-15031