Merge In Main Server

The current version has many crashes for clients trying to connect to
the server. Reverting back to 3.8 main server.