Merge branch '4.6' into master

diff --cc CRM/Campaign/Page/AJAX.php
Simple merge

diff --cc CRM/Contact/Page/AJAX.php
index a2a9b3bd9c54559ebc3f2dce95ba5092186e3795,fc081a466c4aa3ef84b978ff903ef18c5d952d28..505dfa5e5a46e27eb39285f31db88408bc98b3ab
--- 1/CRM/Contact/Page/AJAX.php
--- 2/CRM/Contact/Page/AJAX.php
+++ b/CRM/Contact/Page/AJAX.php
@@@ -305,14 -305,13 +305,13 @@@ class CRM_Contact_Page_AJAX 
     * Delete custom value.
     */
    public static function deleteCustomValue() {
 -    header('Content-Type: text/plain');
 +    CRM_Utils_System::setHttpHeader('Content-Type', 'text/plain');
      $customValueID = CRM_Utils_Type::escape($_REQUEST['valueID'], 'Positive');
      $customGroupID = CRM_Utils_Type::escape($_REQUEST['groupID'], 'Positive');
- 
+     $contactId = CRM_Utils_Request::retrieve('contactId', 'Positive', CRM_Core_DAO::$_nullObject);
      CRM_Core_BAO_CustomValue::deleteCustomValue($customValueID, $customGroupID);
-     $contactId = CRM_Utils_Array::value('contactId', $_REQUEST);
      if ($contactId) {
-       echo CRM_Contact_BAO_Contact::getCountComponent('custom_' . $_REQUEST['groupID'], $contactId);
+       echo CRM_Contact_BAO_Contact::getCountComponent('custom_' . $customGroupID, $contactId);
      }
  
      // reset the group contact cache for this group

diff --cc CRM/Core/Error.php
Simple merge

diff --cc CRM/Financial/Page/AJAX.php
Simple merge