Merge branch '5.40'

diff --cc contributor-key.yml
index 693051fef7a551c8b671f06c79f668ce668fad88,26e084abe5a2cca5466d43946a5baceab1669ef7..10c04baef3a399203661d9abf0badac299a33468
--- 1/contributor-key.yml
--- 2/contributor-key.yml
+++ b/contributor-key.yml
@@@ -999,13 -836,8 +836,12 @@@
    name        : Madhavi Malgaonkar
    organization: OSSeed Technologies
  
 +- github      : madsferak
 +  name        : Mads Mitchell
 +  organization: Humanism Scotland
 +
  - name        : Madura Krishnamoorthy
    organization: CompuCorp
-   jira        : madura
  
  - github      : magnolia61
    name        : Richard van Oosterhout

diff --cc ext/legacycustomsearches/CRM/Contact/Form/Search/Custom/Group.php
Simple merge