Merge pull request #3199 from davecivicrm/CRM-14656