Merge branch '4.6' into master

diff --cc CRM/Contact/Form/Search/Advanced.php
index 8335159080ac5b69b8cf8e135594f9ad29567149,6572be6c58953556ee47c24cb0f6d092484a22db..e82ae6bf3573b6de0e2b557f9cc2ad86b367a6ed
--- 1/CRM/Contact/Form/Search/Advanced.php
--- 2/CRM/Contact/Form/Search/Advanced.php
+++ b/CRM/Contact/Form/Search/Advanced.php
@@@ -377,10 -377,8 +377,11 @@@ class CRM_Contact_Form_Search_Advanced 
        'activity_type_id',
        'status_id',
        'activity_subject',
 +      'contribution_page_id',
 +      'contribution_product_id',
 +      'payment_instrument_id',
      );
+     $specialParams += preg_grep('/^custom_/', array_keys($this->_formValues));
      foreach ($specialParams as $element) {
        $value = CRM_Utils_Array::value($element, $this->_formValues);
        if ($value) {

diff --cc CRM/Core/BAO/CustomField.php
Simple merge

diff --cc CRM/Core/BAO/CustomQuery.php
Simple merge

diff --cc templates/CRM/Case/Form/Activity.tpl
Simple merge