Merge pull request #725 from davecivicrm/CRM-12562