Merge pull request #4707 from davecivicrm/CRM-13984