Merge pull request #3526 from davecivicrm/CRM-14875