Merge branch 'master' into persist-uhm-settings-to-disk

diff --cc CHANGES
index f1992093a5b37c799143136f9bc823cf2339cd1a,b1ddb71157acf7edfdca0ee6c28fdd7a617c1d6b..6aacaab22b6c290640512072456969d0d1a62442
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,10 -1,9 +1,10 @@@
  Changes for 2.2.0:
  ------------------
  rasengan (2):
-      Search for WEBIRC users using /rwho (PR #139)
       Added /stats P to show listening ports (PR #134)
  
 -Ryan Smith (9):
 +Ryan Smith (10):
++=======
       Override clone limits with SVSCLONE (PR #148)
       Updates to user hostmasking (PR #175)
       Do not attempt to mask the Staff_Address for opers. (PR #175)