Merge branch 'master' into next

* master:
  * Auto re-op clients if mdop protection is on

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -1,7 +1,5 @@
 next
   * Bot will now jump from the server it's on if it is removed from the server list. (fixes a changing network bug)
-  * When 'mdop' protection is on, re-op all previously opped clients automatically.
-  * When 'mop' protection is on, deop all previously regular clients automatically.
   * Properly honor exemptions when kicking matched RBL clients
   * Fix various places incorrectly truncating passwords at 15 characters
 
@@ -23,6 +21,8 @@ next
   * FiSH message support added.
   * FiSH support for DH1080 key-exchange. 'keyx' command added to start from bot, and responds to key-exchanges.
   * Auto FiSH key-exchange when accepting users via callerid
+  * When 'mdop' protection is on, re-op all previously opped clients automatically.
+  * When 'mop' protection is on, deop all previously regular clients automatically.
 
 maint
   * Fix --disable-ipv6 compiling