Merge pull request #3527 from davecivicrm/CRM-14734