Upstream merge

pom.xml

@@ -19,6 +19,7 @@
     <url>https://github.com/SpigotMC/Spigot</url>
 
     <modules>
+        <module>MinecraftServer</module>
         <module>MinecraftRelocate</module>
         <module>Spigot-Server</module>
         <module>Spigot-API</module>
@@ -45,4 +46,4 @@
             <url>http://repo.md-5.net/content/repositories/snapshots/</url>
         </snapshotRepository>
     </distributionManagement>
-</project>
+</project>