Merge branch 'master' into temp-propose-alternative-solution-to-xbl-any-hack

diff --cc conf/composites.conf
Simple merge

diff --cc conf/scores.d/rbl_group.conf
index 7fd13b06fe752913a0e9fffc496a8cf68992dcc2,40b68c947edb64fe6ce4ad8e611884183ab61357..e24d7d14ccc28117db3e7f511c1a8899dda21111
--- 1/conf/scores.d/rbl_group.conf
--- 2/conf/scores.d/rbl_group.conf
+++ b/conf/scores.d/rbl_group.conf
@@@ -98,12 -98,17 +98,12 @@@ symbols = 
      }
      "RBL_SPAMHAUS_XBL" {
          weight = 4.0;
-         description = "From address is listed in ZEN XBL";
+         description = "From address is listed in Spamhaus XBL";
          groups = ["spamhaus"];
      }
 -    "RBL_SPAMHAUS_XBL_ANY" {
 -        weight = 4.0;
 -        description = "From or received address is listed in ZEN XBL (any list)";
 -        groups = ["spamhaus"];
 -    }
      "RBL_SPAMHAUS_PBL" {
          weight = 2.0;
-         description = "From address is listed in ZEN PBL (ISP list)";
+         description = "From address is listed in Spamhaus PBL";
          groups = ["spamhaus"];
      }
      "RBL_SPAMHAUS_DROP" {