Merge pull request #2305 from davecivicrm/CRM-12753a