v3.1.x

If anyone updated v3.1.x from github earlier today, you'll have to do a force pull to get the head of v3.1.x. There were a few changes I pushed which (in hindsight) belong elsewhere. So I've reverted them. We're working on fixing the server core to support a wide range of new features. The bad news is that these features will require configuration changes that are incompatible with the v3.x branch. The good news is that I've created a v4.0.x branch which will contain the changes. Alan DeKok.