Update to latest mainstream

Update to the latest mainstream.
This imports the mc-server commits to my Project