Merge branch 'civicrm:master' into issue5610

CRM/Activity/BAO/ActivityContact.php

CRM/Admin/Form/PaymentProcessor.php

CRM/Admin/Form/Preferences/Mailing.php

CRM/Admin/Form/Setting/Miscellaneous.php

CRM/Batch/Form/Entry.php

CRM/Campaign/Form/Survey.php

CRM/Campaign/Form/Survey/TabHeader.php

CRM/Campaign/Page/Vote.php

CRM/Case/BAO/Case.php

CRM/Case/Page/Tab.php

CRM/Case/XMLProcessor/Process.php

CRM/Contact/BAO/Contact.php

CRM/Contact/BAO/SavedSearch.php

CRM/Contact/Form/Edit/CommunicationPreferences.php

CRM/Contact/Form/Location.php

CRM/Contact/Form/Merge.php

CRM/Contact/Form/Relationship.php

CRM/Contact/Page/View/Summary.php

CRM/Contribute/Form/AdditionalPayment.php

CRM/Contribute/Form/ContributionPage/TabHeader.php