diff --git a/.travis.yml b/.travis.yml
@@ -25,7 +25,7 @@ addons:
     branch_pattern: coverity_scan
 
 script:
- - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$CC" = "gcc" ]; then export CC=gcc-4.8; fi
+# - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$CC" = "gcc" ]; then export CC=gcc-4.8; fi
  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./configure --disable-openssl --enable-assert; else ./configure --enable-assert; fi
  - make
  - sudo make install

diff --git a/NEWS b/NEWS
@@ -1,3 +1,13 @@
+-- Noteworthy changes in version 8.2.1 (2014-10-21)
+o) Fixed bug where "/undline remote.server IP" did not work as expected
+o) Servers are now allowed to add/remove K-/D-/X-lines and RESVs
+o) Usermode +G now no longer allows to override +g
+o) Due to potential weakness, TLS session caching and session tickets
+   have been disabled
+o) Minor improvements to TS6 implementation
+o) /WHOWAS now shows the name of the services account a user was logged in
+
+
 -- Noteworthy changes in version 8.2.0 (2014-08-24)
 o) Successful operator logins are now announced globally via GLOBOPS
 o) Cleanups and improvements to the resolver code

diff --git a/README b/README
@@ -8,6 +8,11 @@ Contact Information:
   * IRC contact:
     - #ircd-coders on irc.ircd-hybrid.org
 
+Recommended IRC services package:
+
+- Anope 2.0.1 and above, which can be found on http://anope.org
+
+
 ******************************* IMPORTANT *************************************
 
   ************ Note for those who don't bother reading docs ***************

diff --git a/config.h.in b/config.h.in
@@ -213,6 +213,9 @@
 /* Size of the client mempool chunk. */
 #undef MP_CHUNK_SIZE_CLIENT
 
+/* Size of the connection mempool chunk. */
+#undef MP_CHUNK_SIZE_CONNECTION
+
 /* Size of the dbuf mempool chunk. */
 #undef MP_CHUNK_SIZE_DBUF
 
@@ -225,9 +228,6 @@
 /* Size of the ip_entry mempool chunk. */
 #undef MP_CHUNK_SIZE_IP_ENTRY
 
-/* Size of the local client mempool chunk. */
-#undef MP_CHUNK_SIZE_LCLIENT
-
 /* Size of the channel-member mempool chunk. */
 #undef MP_CHUNK_SIZE_MEMBER
 

diff --git a/configure b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Id: configure.ac 4561 2014-08-24 09:46:04Z michael .
+# From configure.ac Id: configure.ac 4578 2014-08-25 09:53:48Z michael .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ircd-hybrid 8.2.0.
+# Generated by GNU Autoconf 2.69 for ircd-hybrid 8.2.1.
 #
 # Report bugs to <bugs@ircd-hybrid.org>.
 #
@@ -593,8 +593,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ircd-hybrid'
 PACKAGE_TARNAME='ircd-hybrid'
-PACKAGE_VERSION='8.2.0'
-PACKAGE_STRING='ircd-hybrid 8.2.0'
+PACKAGE_VERSION='8.2.1'
+PACKAGE_STRING='ircd-hybrid 8.2.1'
 PACKAGE_BUGREPORT='bugs@ircd-hybrid.org'
 PACKAGE_URL=''
 
@@ -1366,7 +1366,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ircd-hybrid 8.2.0 to adapt to many kinds of systems.
+\`configure' configures ircd-hybrid 8.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1436,7 +1436,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ircd-hybrid 8.2.0:";;
+     short | recursive ) echo "Configuration of ircd-hybrid 8.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1564,7 +1564,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ircd-hybrid configure 8.2.0
+ircd-hybrid configure 8.2.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2033,7 +2033,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ircd-hybrid $as_me 8.2.0, which was
+It was created by ircd-hybrid $as_me 8.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2907,7 +2907,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ircd-hybrid'
- VERSION='8.2.0'
+ VERSION='8.2.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13884,7 +13884,7 @@ $as_echo "#define MP_CHUNK_SIZE_BAN 1024*1024" >>confdefs.h
 $as_echo "#define MP_CHUNK_SIZE_CLIENT 1024*1024" >>confdefs.h
 
 
-$as_echo "#define MP_CHUNK_SIZE_LCLIENT 512*1024" >>confdefs.h
+$as_echo "#define MP_CHUNK_SIZE_CONNECTION 512*1024" >>confdefs.h
 
 
 $as_echo "#define MP_CHUNK_SIZE_DNODE 32*1024" >>confdefs.h
@@ -16606,7 +16606,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ircd-hybrid $as_me 8.2.0, which was
+This file was extended by ircd-hybrid $as_me 8.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16672,7 +16672,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ircd-hybrid config.status 8.2.0
+ircd-hybrid config.status 8.2.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
@@ -4,7 +4,7 @@
 AC_REVISION([$Id$])
 
 AC_PREREQ(2.69)
-AC_INIT([ircd-hybrid], [8.2.0], [bugs@ircd-hybrid.org])
+AC_INIT([ircd-hybrid], [8.2.1], [bugs@ircd-hybrid.org])
 AM_INIT_AUTOMAKE(1.13.1 subdir-objects)
 AM_MAINTAINER_MODE
 AC_CONFIG_MACRO_DIR([m4])
@@ -70,7 +70,7 @@ AC_DEFINE([MP_CHUNK_SIZE_CHANNEL], 1024*1024, [Size of the channel mempool chunk
 AC_DEFINE([MP_CHUNK_SIZE_MEMBER], 2048*1024, [Size of the channel-member mempool chunk.])
 AC_DEFINE([MP_CHUNK_SIZE_BAN], 1024*1024, [Size of the ban mempool chunk.])
 AC_DEFINE([MP_CHUNK_SIZE_CLIENT], 1024*1024, [Size of the client mempool chunk.])
-AC_DEFINE([MP_CHUNK_SIZE_LCLIENT], 512*1024, [Size of the local client mempool chunk.])
+AC_DEFINE([MP_CHUNK_SIZE_CONNECTION], 512*1024, [Size of the connection mempool chunk.])
 AC_DEFINE([MP_CHUNK_SIZE_DNODE], 32*1024, [Size of the dlink_node mempool chunk.])
 AC_DEFINE([MP_CHUNK_SIZE_DBUF], 512*1024, [Size of the dbuf mempool chunk.])
 AC_DEFINE([MP_CHUNK_SIZE_AUTH], 128*1024, [Size of the auth mempool chunk.])

diff --git a/doc/reference.conf b/doc/reference.conf
@@ -817,75 +817,75 @@ pseudo {
 };
 
 pseudo {
-        command = "CHANSERV";
-        name = "ChanServ";
-        target = "ChanServ@service.someserver";
+	command = "CHANSERV";
+	name = "ChanServ";
+	target = "ChanServ@service.someserver";
 };
 
 pseudo {
-        command = "CS";
-        name = "ChanServ";
-        target = "ChanServ@service.someserver";
+	command = "CS";
+	name = "ChanServ";
+	target = "ChanServ@service.someserver";
 };
 
 pseudo {
-        command = "NICKSERV";
-        name = "NickServ";
-        target = "NickServ@service.someserver";
+	command = "NICKSERV";
+	name = "NickServ";
+	target = "NickServ@service.someserver";
 };
 
 pseudo {
-        command = "NS";
-        name = "NickServ";
-        target = "NickServ@service.someserver";
+	command = "NS";
+	name = "NickServ";
+	target = "NickServ@service.someserver";
 };
 
 pseudo {
-        command = "MEMOSERV";
-        name = "MemoServ";
-        target = "MemoServ@service.someserver";
+	command = "MEMOSERV";
+	name = "MemoServ";
+	target = "MemoServ@service.someserver";
 };
 
 pseudo {
-        command = "MS";
-        name = "MemoServ";
-        target = "MemoServ@service.someserver";
+	command = "MS";
+	name = "MemoServ";
+	target = "MemoServ@service.someserver";
 };
 
 pseudo {
-        command = "OPERSERV";
-        name = "OperServ";
-        target = "OperServ@service.someserver";
+	command = "OPERSERV";
+	name = "OperServ";
+	target = "OperServ@service.someserver";
 };
 
 pseudo {
-        command = "OS";
-        name = "OperServ";
-        target = "OperServ@service.someserver";
+	command = "OS";
+	name = "OperServ";
+	target = "OperServ@service.someserver";
 };
 
 pseudo {
-        command = "HOSTSERV";
-        name = "HostServ";
-        target = "HostServ@service.someserver";
+	command = "HOSTSERV";
+	name = "HostServ";
+	target = "HostServ@service.someserver";
 };
 
 pseudo {
-        command = "HS";
-        name = "HostServ";
-        target = "HostServ@service.someserver";
+	command = "HS";
+	name = "HostServ";
+	target = "HostServ@service.someserver";
 };
 
 pseudo {
-        command = "BOTSERV";
-        name = "BotServ";
-        target = "BotServ@service.someserver";
+	command = "BOTSERV";
+	name = "BotServ";
+	target = "BotServ@service.someserver";
 };
 
 pseudo {
-        command = "BS";
-        name = "BotServ";
-        target = "BotServ@service.someserver";
+	command = "BS";
+	name = "BotServ";
+	target = "BotServ@service.someserver";
 };
 
 /*

diff --git a/include/channel.h b/include/channel.h
@@ -85,7 +85,7 @@ struct Channel
 
   float number_joined;
 
-  char chname[CHANNELLEN + 1];
+  char name[CHANNELLEN + 1];
 };
 
 /*! \brief Membership structure */

diff --git a/include/client.h b/include/client.h
@@ -82,7 +82,7 @@ struct MaskItem;
                                  (x)->handler = HasUMode(x, UMODE_OPER) ? \
                                  OPER_HANDLER : CLIENT_HANDLER; }
 
-#define MyConnect(x)            ((x)->localClient != NULL)
+#define MyConnect(x)            ((x)->connection != NULL)
 #define MyClient(x)             (MyConnect(x) && IsClient(x))
 
 /*
@@ -99,7 +99,7 @@ struct MaskItem;
 #define CAP_AWAY_NOTIFY   0x00000002U
 #define CAP_UHNAMES       0x00000004U
 
-#define HasCap(x, y) ((x)->localClient->cap_active & (y))
+#define HasCap(x, y) ((x)->connection->cap_active & (y))
 
 
 /* housekeeping flags */
@@ -202,10 +202,10 @@ struct MaskItem;
 #define OPER_FLAG_UNXLINE        0x00400000U  /**< Oper can use UNXLINE command */
 
 
-#define HasOFlag(x, y) (MyConnect(x) ? (x)->localClient->operflags & (y) : 0)
-#define AddOFlag(x, y) ((x)->localClient->operflags |=  (y))
-#define DelOFlag(x, y) ((x)->localClient->operflags &= ~(y))
-#define ClrOFlag(x)    ((x)->localClient->operflags = 0)
+#define HasOFlag(x, y) (MyConnect(x) ? (x)->connection->operflags & (y) : 0)
+#define AddOFlag(x, y) ((x)->connection->operflags |=  (y))
+#define DelOFlag(x, y) ((x)->connection->operflags &= ~(y))
+#define ClrOFlag(x)    ((x)->connection->operflags = 0)
 
 
 
@@ -296,12 +296,12 @@ struct ListTask
   char topic[TOPICLEN + 1];
 };
 
-/*! \brief LocalUser structure
+/*! \brief Connection structure
  *
  * Allocated only for local clients, that are directly connected
  * to \b this server with a socket.
  */
-struct LocalUser
+struct Connection
 {
   dlink_node   lclient_node;
 
@@ -378,7 +378,7 @@ struct Client
   dlink_node node;
   dlink_node lnode;             /**< Used for Server->servers/users */
 
-  struct LocalUser *localClient;
+  struct Connection *connection;
   struct Client    *hnext;      /**< For client hash table lookups by name */
   struct Client    *idhnext;    /**< For SID hash table lookups by sid */
   struct Server    *serv;       /**< ...defined, if this is a server */

diff --git a/include/ircd.h b/include/ircd.h
@@ -69,9 +69,9 @@ struct ServerStatistics
   unsigned int    is_kill; /* number of kills generated on collisions */
   unsigned int    is_asuc; /* successful auth requests */
   unsigned int    is_abad; /* bad auth requests */
-};
+} ServerStats;
 
-struct Counter
+struct
 {
   uint64_t totalrestartcount; /* Total client count ever */
   unsigned int myserver;      /* my servers          */
@@ -103,7 +103,6 @@ extern const char *pidFileName;
 extern int dorehash;
 extern int doremotd;
 extern struct event event_write_links_file;
-extern struct ServerStatistics ServerStats;
 extern struct timeval SystemTime;
 #define CurrentTime SystemTime.tv_sec
 extern int unsigned default_server_capabs;

diff --git a/include/numeric.h b/include/numeric.h
@@ -216,7 +216,6 @@ enum irc_numerics
   ERR_NOPRIVILEGES         = 481,
   ERR_CHANOPRIVSNEEDED     = 482,
   ERR_CANTKILLSERVER       = 483,
-  ERR_RESTRICTED           = 484,
   ERR_CHANBANREASON        = 485,
   ERR_NONONREG             = 486,
   ERR_NOOPERHOST           = 491,

diff --git a/include/patchlevel.h b/include/patchlevel.h
@@ -25,5 +25,5 @@
  */
 
 #ifndef PATCHLEVEL
-#define PATCHLEVEL   "hybrid-8.2.0"
+#define PATCHLEVEL   "hybrid-8.2.1"
 #endif
diff --git a/include/server.h b/include/server.h
@@ -71,9 +71,9 @@ struct Capability
 /*
  * Capability macros.
  */
-#define IsCapable(x, cap)       ((x)->localClient->caps &   (cap))
-#define SetCapable(x, cap)      ((x)->localClient->caps |=  (cap))
-#define ClearCap(x, cap)        ((x)->localClient->caps &= ~(cap))
+#define IsCapable(x, cap)       ((x)->connection->caps &   (cap))
+#define SetCapable(x, cap)      ((x)->connection->caps |=  (cap))
+#define ClearCap(x, cap)        ((x)->connection->caps &= ~(cap))
 
 
 /*