diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties
index a7705e9826..45d8ec139e 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties
@@ -8,7 +8,7 @@ command.dir=/home/lvuser/
 # Libraries to use
 wpilib=${user.home}/wpilib/cpp/${cpp-version}
 wpilib.lib=${wpilib}/lib
-roboRIOAllowedImages=18
+roboRIOAllowedImages=19
 
 # Ant support
 wpilib.ant.dir=${wpilib}/ant
diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties
index 34ed687341..455887cf30 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties
@@ -20,7 +20,7 @@ networktables.sources=${wpilib.lib}/NetworkTables-sources.jar
 #jnaerator.jar=${wpilib.lib}/jnaerator-runtime.jar
 #classpath=${wpilib.jar}:${networktables.jar}:${jna.jar}:${jnaerator.jar}
 classpath=${wpilib.jar}:${networktables.jar}
-roboRIOAllowedImages=18
+roboRIOAllowedImages=19
 
 # Ant support
 wpilib.ant.dir=${wpilib}/ant
diff --git a/hal/lib/Athena/NetworkCommunication/CANSessionMux.h b/hal/lib/Athena/NetworkCommunication/CANSessionMux.h
index 81f63c579f..3f8a6f192f 100644
--- a/hal/lib/Athena/NetworkCommunication/CANSessionMux.h
+++ b/hal/lib/Athena/NetworkCommunication/CANSessionMux.h
@@ -26,6 +26,7 @@
 #define WARN_CANSessionMux_NoToken         44087
 #define ERR_CANSessionMux_NotAllowed      -44088
 #define ERR_CANSessionMux_NotInitialized  -44089
+#define ERR_CANSessionMux_SessionOverrun   44050
 
 struct tCANStreamMessage{
 	uint32_t messageID;
diff --git a/hal/lib/Athena/NetworkCommunication/FRCComm.h b/hal/lib/Athena/NetworkCommunication/FRCComm.h
index 87e3ee5291..d7081365a5 100644
--- a/hal/lib/Athena/NetworkCommunication/FRCComm.h
+++ b/hal/lib/Athena/NetworkCommunication/FRCComm.h
@@ -33,6 +33,7 @@
 #endif
 
 #define ERR_FRCSystem_NetCommNotResponding -44049
+#define ERR_FRCSystem_NoDSConnection -44018
 
 enum AllianceStationID_t {
 	kAllianceStationID_red1,
@@ -43,6 +44,13 @@ enum AllianceStationID_t {
 	kAllianceStationID_blue3,
 };
 
+enum MatchType_t {
+	kMatchType_none,
+	kMatchType_practice,
+	kMatchType_qualification,
+	kMatchType_elimination,
+};
+
 struct ControlWord_t {
 #ifndef __vxworks
 	uint32_t enabled : 1;
diff --git a/ni-libraries/libFRC_NetworkCommunication.so.1.5.0 b/ni-libraries/libFRC_NetworkCommunication.so.1.5.0
index 02fecb81ff..121bc7ee2e 100755
Binary files a/ni-libraries/libFRC_NetworkCommunication.so.1.5.0 and b/ni-libraries/libFRC_NetworkCommunication.so.1.5.0 differ
diff --git a/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0 b/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0
index c9a00e3c49..3e6a5030d4 100755
Binary files a/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0 and b/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0 differ