CRM_12639_fix : sending a clean PR after https://github.com/civicrm/civi...

CRM_12639_fix : sending a clean PR after https://github.com/civicrm/civicrm-core/pull/1272 produced merge conflict