Merge pull request #2166 from davecivicrm/CRM-13420