CRM-9855

----------------------------------------
* CRM-9855: CiviMail sets X-header "X-CiviMail-Bounce" on outbound bulk email, but does not use it to identify an inbound bounce
  http://issues.civicrm.org/jira/browse/CRM-9855
Merge pull request #791 from dlobo/CRM-9855

CRM-9855
CRM-12172

----------------------------------------
* CRM-12172: Use preg_replace_callback() in CRM_Utils_Token
  http://issues.civicrm.org/jira/browse/CRM-12172
Merge pull request #797 from dlobo/CRM-12172

CRM-12172