Merge upstream

resolves #190

BungeeCord

@@ -1 +1 @@
-Subproject commit 2e826a15e73166538093514b09281db3c44ca896
+Subproject commit cccbb3c889d7d9b5aaacfc5d5d3062bd0d660284

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 40e8d009682f0b5b23430f50f501e8f85669b2b1 Mon Sep 17 00:00:00 2001
+From 1d6cb01be6550b3cbda1165fbcb9acc140d7090b Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 10:33:31 -0700
 Subject: [PATCH] POM Changes
@@ -179,7 +179,7 @@ index 970e3097..a908c13e 100644
  
      <dependencies>
 diff --git a/config/pom.xml b/config/pom.xml
-index 253bfdff..d3146344 100644
+index 255270c6..f4551e4c 100644
 --- a/config/pom.xml
 +++ b/config/pom.xml
 @@ -4,19 +4,19 @@
@@ -494,7 +494,7 @@ index 082f0908..8b045e3b 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index fbbe6717..8ab84091 100644
+index 3502b9b6..8d4abb4a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -589,7 +589,7 @@ index fbbe6717..8ab84091 100644
  
      <properties>
          <build.number>unknown</build.number>
-         <netty.version>4.1.15.Final</netty.version>
+         <netty.version>4.1.17.Final</netty.version>
 -        <maven.compiler.source>1.7</maven.compiler.source>
 -        <maven.compiler.target>1.7</maven.compiler.target>
 +        <!-- Require Java 8 -->
@@ -828,5 +828,5 @@ index 9ecb2612..4b3613fa 100644
              <scope>compile</scope>
          </dependency>
 -- 
-2.14.1
+2.15.0