diff --git a/HostSupport/HostSupport.vcproj b/HostSupport/HostSupport.vcproj
index a17d206b9..b539c53a3 100644
--- a/HostSupport/HostSupport.vcproj
+++ b/HostSupport/HostSupport.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\include;include;expat-2.2.10\lib"
+				AdditionalIncludeDirectories="..\include;include;expat-2.3.0\lib"
 				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -106,7 +106,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\include;include;expat-2.2.10\lib"
+				AdditionalIncludeDirectories="..\include;include;expat-2.3.0\lib"
 				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -172,7 +172,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\include;include;expat-2.2.10\lib"
+				AdditionalIncludeDirectories="..\include;include;expat-2.3.0\lib"
 				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -237,7 +237,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\include;include;expat-2.2.10\lib"
+				AdditionalIncludeDirectories="..\include;include;expat-2.3.0\lib"
 				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -298,7 +298,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\include;include;expat-2.2.10\lib"
+				AdditionalIncludeDirectories="..\include;include;expat-2.3.0\lib"
 				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -362,7 +362,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\include;include;expat-2.2.10\lib"
+				AdditionalIncludeDirectories="..\include;include;expat-2.3.0\lib"
 				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -425,7 +425,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\include;include;expat-2.2.10\lib"
+				AdditionalIncludeDirectories="..\include;include;expat-2.3.0\lib"
 				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -487,7 +487,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\include;include;expat-2.2.10\lib"
+				AdditionalIncludeDirectories="..\include;include;expat-2.3.0\lib"
 				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/HostSupport/HostSupport.xcodeproj/project.pbxproj b/HostSupport/HostSupport.xcodeproj/project.pbxproj
index 70fd60759..fa55abd5c 100644
--- a/HostSupport/HostSupport.xcodeproj/project.pbxproj
+++ b/HostSupport/HostSupport.xcodeproj/project.pbxproj
@@ -453,7 +453,7 @@
 				1E3CB8C1179935430032B538 /* xmltok.c */,
 			);
 			name = "Expat Sources";
-			path = "expat-2.2.10/lib";
+			path = "expat-2.3.0/lib";
 			sourceTree = "<group>";
 		};
 		1E742FE117992CF9007D295B = {
diff --git a/HostSupport/Makefile b/HostSupport/Makefile
index e2e48b18d..3bcb2c544 100644
--- a/HostSupport/Makefile
+++ b/HostSupport/Makefile
@@ -6,7 +6,7 @@
 
 OS = $(shell uname)
 DEBUG ?= false
-EXPAT ?= expat-2.2.10
+EXPAT ?= expat-2.3.0
 EXPAT_INCLUDE ?= $(EXPAT)/lib
 OBJSUF ?= .o
 LIBSUF ?= .a
diff --git a/HostSupport/expat-2.2.10/AUTHORS b/HostSupport/expat-2.3.0/AUTHORS
similarity index 100%
rename from HostSupport/expat-2.2.10/AUTHORS
rename to HostSupport/expat-2.3.0/AUTHORS
diff --git a/HostSupport/expat-2.2.10/CMake.README b/HostSupport/expat-2.3.0/CMake.README
similarity index 100%
rename from HostSupport/expat-2.2.10/CMake.README
rename to HostSupport/expat-2.3.0/CMake.README
diff --git a/HostSupport/expat-2.2.10/CMakeLists.txt b/HostSupport/expat-2.3.0/CMakeLists.txt
similarity index 100%
rename from HostSupport/expat-2.2.10/CMakeLists.txt
rename to HostSupport/expat-2.3.0/CMakeLists.txt
diff --git a/HostSupport/expat-2.2.10/COPYING b/HostSupport/expat-2.3.0/COPYING
similarity index 100%
rename from HostSupport/expat-2.2.10/COPYING
rename to HostSupport/expat-2.3.0/COPYING
diff --git a/HostSupport/expat-2.2.10/Changes b/HostSupport/expat-2.3.0/Changes
similarity index 100%
rename from HostSupport/expat-2.2.10/Changes
rename to HostSupport/expat-2.3.0/Changes
diff --git a/HostSupport/expat-2.2.10/ConfigureChecks.cmake b/HostSupport/expat-2.3.0/ConfigureChecks.cmake
similarity index 100%
rename from HostSupport/expat-2.2.10/ConfigureChecks.cmake
rename to HostSupport/expat-2.3.0/ConfigureChecks.cmake
diff --git a/HostSupport/expat-2.2.10/Makefile.am b/HostSupport/expat-2.3.0/Makefile.am
similarity index 100%
rename from HostSupport/expat-2.2.10/Makefile.am
rename to HostSupport/expat-2.3.0/Makefile.am
diff --git a/HostSupport/expat-2.2.10/Makefile.in b/HostSupport/expat-2.3.0/Makefile.in
similarity index 100%
rename from HostSupport/expat-2.2.10/Makefile.in
rename to HostSupport/expat-2.3.0/Makefile.in
diff --git a/HostSupport/expat-2.2.10/README.md b/HostSupport/expat-2.3.0/README.md
similarity index 100%
rename from HostSupport/expat-2.2.10/README.md
rename to HostSupport/expat-2.3.0/README.md
diff --git a/HostSupport/expat-2.2.10/acinclude.m4 b/HostSupport/expat-2.3.0/acinclude.m4
similarity index 100%
rename from HostSupport/expat-2.2.10/acinclude.m4
rename to HostSupport/expat-2.3.0/acinclude.m4
diff --git a/HostSupport/expat-2.2.10/aclocal.m4 b/HostSupport/expat-2.3.0/aclocal.m4
similarity index 100%
rename from HostSupport/expat-2.2.10/aclocal.m4
rename to HostSupport/expat-2.3.0/aclocal.m4
diff --git a/HostSupport/expat-2.2.10/cmake/autotools/expat-config-version.cmake.in b/HostSupport/expat-2.3.0/cmake/autotools/expat-config-version.cmake.in
similarity index 100%
rename from HostSupport/expat-2.2.10/cmake/autotools/expat-config-version.cmake.in
rename to HostSupport/expat-2.3.0/cmake/autotools/expat-config-version.cmake.in
diff --git a/HostSupport/expat-2.2.10/cmake/autotools/expat-noconfig.cmake.in b/HostSupport/expat-2.3.0/cmake/autotools/expat-noconfig.cmake.in
similarity index 100%
rename from HostSupport/expat-2.2.10/cmake/autotools/expat-noconfig.cmake.in
rename to HostSupport/expat-2.3.0/cmake/autotools/expat-noconfig.cmake.in
diff --git a/HostSupport/expat-2.2.10/cmake/autotools/expat-package-init.cmake b/HostSupport/expat-2.3.0/cmake/autotools/expat-package-init.cmake
similarity index 100%
rename from HostSupport/expat-2.2.10/cmake/autotools/expat-package-init.cmake
rename to HostSupport/expat-2.3.0/cmake/autotools/expat-package-init.cmake
diff --git a/HostSupport/expat-2.2.10/cmake/autotools/expat.cmake b/HostSupport/expat-2.3.0/cmake/autotools/expat.cmake
similarity index 100%
rename from HostSupport/expat-2.2.10/cmake/autotools/expat.cmake
rename to HostSupport/expat-2.3.0/cmake/autotools/expat.cmake
diff --git a/HostSupport/expat-2.2.10/cmake/expat-config.cmake.in b/HostSupport/expat-2.3.0/cmake/expat-config.cmake.in
similarity index 100%
rename from HostSupport/expat-2.2.10/cmake/expat-config.cmake.in
rename to HostSupport/expat-2.3.0/cmake/expat-config.cmake.in
diff --git a/HostSupport/expat-2.2.10/cmake/mingw-toolchain.cmake b/HostSupport/expat-2.3.0/cmake/mingw-toolchain.cmake
similarity index 100%
rename from HostSupport/expat-2.2.10/cmake/mingw-toolchain.cmake
rename to HostSupport/expat-2.3.0/cmake/mingw-toolchain.cmake
diff --git a/HostSupport/expat-2.2.10/configure b/HostSupport/expat-2.3.0/configure
similarity index 100%
rename from HostSupport/expat-2.2.10/configure
rename to HostSupport/expat-2.3.0/configure
diff --git a/HostSupport/expat-2.2.10/configure.ac b/HostSupport/expat-2.3.0/configure.ac
similarity index 100%
rename from HostSupport/expat-2.2.10/configure.ac
rename to HostSupport/expat-2.3.0/configure.ac
diff --git a/HostSupport/expat-2.2.10/conftools/PrintPath b/HostSupport/expat-2.3.0/conftools/PrintPath
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/PrintPath
rename to HostSupport/expat-2.3.0/conftools/PrintPath
diff --git a/HostSupport/expat-2.2.10/conftools/ar-lib b/HostSupport/expat-2.3.0/conftools/ar-lib
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/ar-lib
rename to HostSupport/expat-2.3.0/conftools/ar-lib
diff --git a/HostSupport/expat-2.2.10/conftools/ax-append-compile-flags.m4 b/HostSupport/expat-2.3.0/conftools/ax-append-compile-flags.m4
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/ax-append-compile-flags.m4
rename to HostSupport/expat-2.3.0/conftools/ax-append-compile-flags.m4
diff --git a/HostSupport/expat-2.2.10/conftools/ax-append-flag.m4 b/HostSupport/expat-2.3.0/conftools/ax-append-flag.m4
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/ax-append-flag.m4
rename to HostSupport/expat-2.3.0/conftools/ax-append-flag.m4
diff --git a/HostSupport/expat-2.2.10/conftools/ax-append-link-flags.m4 b/HostSupport/expat-2.3.0/conftools/ax-append-link-flags.m4
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/ax-append-link-flags.m4
rename to HostSupport/expat-2.3.0/conftools/ax-append-link-flags.m4
diff --git a/HostSupport/expat-2.2.10/conftools/ax-check-compile-flag.m4 b/HostSupport/expat-2.3.0/conftools/ax-check-compile-flag.m4
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/ax-check-compile-flag.m4
rename to HostSupport/expat-2.3.0/conftools/ax-check-compile-flag.m4
diff --git a/HostSupport/expat-2.2.10/conftools/ax-check-link-flag.m4 b/HostSupport/expat-2.3.0/conftools/ax-check-link-flag.m4
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/ax-check-link-flag.m4
rename to HostSupport/expat-2.3.0/conftools/ax-check-link-flag.m4
diff --git a/HostSupport/expat-2.2.10/conftools/ax-require-defined.m4 b/HostSupport/expat-2.3.0/conftools/ax-require-defined.m4
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/ax-require-defined.m4
rename to HostSupport/expat-2.3.0/conftools/ax-require-defined.m4
diff --git a/HostSupport/expat-2.2.10/conftools/compile b/HostSupport/expat-2.3.0/conftools/compile
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/compile
rename to HostSupport/expat-2.3.0/conftools/compile
diff --git a/HostSupport/expat-2.2.10/conftools/config.guess b/HostSupport/expat-2.3.0/conftools/config.guess
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/config.guess
rename to HostSupport/expat-2.3.0/conftools/config.guess
diff --git a/HostSupport/expat-2.2.10/conftools/config.sub b/HostSupport/expat-2.3.0/conftools/config.sub
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/config.sub
rename to HostSupport/expat-2.3.0/conftools/config.sub
diff --git a/HostSupport/expat-2.2.10/conftools/depcomp b/HostSupport/expat-2.3.0/conftools/depcomp
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/depcomp
rename to HostSupport/expat-2.3.0/conftools/depcomp
diff --git a/HostSupport/expat-2.2.10/conftools/expat.m4 b/HostSupport/expat-2.3.0/conftools/expat.m4
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/expat.m4
rename to HostSupport/expat-2.3.0/conftools/expat.m4
diff --git a/HostSupport/expat-2.2.10/conftools/expatcfg-compiler-supports-visibility.m4 b/HostSupport/expat-2.3.0/conftools/expatcfg-compiler-supports-visibility.m4
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/expatcfg-compiler-supports-visibility.m4
rename to HostSupport/expat-2.3.0/conftools/expatcfg-compiler-supports-visibility.m4
diff --git a/HostSupport/expat-2.2.10/conftools/get-version.sh b/HostSupport/expat-2.3.0/conftools/get-version.sh
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/get-version.sh
rename to HostSupport/expat-2.3.0/conftools/get-version.sh
diff --git a/HostSupport/expat-2.2.10/conftools/install-sh b/HostSupport/expat-2.3.0/conftools/install-sh
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/install-sh
rename to HostSupport/expat-2.3.0/conftools/install-sh
diff --git a/HostSupport/expat-2.2.10/conftools/ltmain.sh b/HostSupport/expat-2.3.0/conftools/ltmain.sh
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/ltmain.sh
rename to HostSupport/expat-2.3.0/conftools/ltmain.sh
diff --git a/HostSupport/expat-2.2.10/conftools/missing b/HostSupport/expat-2.3.0/conftools/missing
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/missing
rename to HostSupport/expat-2.3.0/conftools/missing
diff --git a/HostSupport/expat-2.2.10/conftools/test-driver b/HostSupport/expat-2.3.0/conftools/test-driver
similarity index 100%
rename from HostSupport/expat-2.2.10/conftools/test-driver
rename to HostSupport/expat-2.3.0/conftools/test-driver
diff --git a/HostSupport/expat-2.2.10/doc/Makefile.am b/HostSupport/expat-2.3.0/doc/Makefile.am
similarity index 100%
rename from HostSupport/expat-2.2.10/doc/Makefile.am
rename to HostSupport/expat-2.3.0/doc/Makefile.am
diff --git a/HostSupport/expat-2.2.10/doc/Makefile.in b/HostSupport/expat-2.3.0/doc/Makefile.in
similarity index 100%
rename from HostSupport/expat-2.2.10/doc/Makefile.in
rename to HostSupport/expat-2.3.0/doc/Makefile.in
diff --git a/HostSupport/expat-2.2.10/doc/expat.png b/HostSupport/expat-2.3.0/doc/expat.png
similarity index 100%
rename from HostSupport/expat-2.2.10/doc/expat.png
rename to HostSupport/expat-2.3.0/doc/expat.png
diff --git a/HostSupport/expat-2.2.10/doc/reference.html b/HostSupport/expat-2.3.0/doc/reference.html
similarity index 100%
rename from HostSupport/expat-2.2.10/doc/reference.html
rename to HostSupport/expat-2.3.0/doc/reference.html
diff --git a/HostSupport/expat-2.2.10/doc/style.css b/HostSupport/expat-2.3.0/doc/style.css
similarity index 100%
rename from HostSupport/expat-2.2.10/doc/style.css
rename to HostSupport/expat-2.3.0/doc/style.css
diff --git a/HostSupport/expat-2.2.10/doc/valid-xhtml10.png b/HostSupport/expat-2.3.0/doc/valid-xhtml10.png
similarity index 100%
rename from HostSupport/expat-2.2.10/doc/valid-xhtml10.png
rename to HostSupport/expat-2.3.0/doc/valid-xhtml10.png
diff --git a/HostSupport/expat-2.2.10/doc/xmlwf.1 b/HostSupport/expat-2.3.0/doc/xmlwf.1
similarity index 100%
rename from HostSupport/expat-2.2.10/doc/xmlwf.1
rename to HostSupport/expat-2.3.0/doc/xmlwf.1
diff --git a/HostSupport/expat-2.2.10/doc/xmlwf.xml b/HostSupport/expat-2.3.0/doc/xmlwf.xml
similarity index 100%
rename from HostSupport/expat-2.2.10/doc/xmlwf.xml
rename to HostSupport/expat-2.3.0/doc/xmlwf.xml
diff --git a/HostSupport/expat-2.2.10/examples/Makefile.am b/HostSupport/expat-2.3.0/examples/Makefile.am
similarity index 100%
rename from HostSupport/expat-2.2.10/examples/Makefile.am
rename to HostSupport/expat-2.3.0/examples/Makefile.am
diff --git a/HostSupport/expat-2.2.10/examples/Makefile.in b/HostSupport/expat-2.3.0/examples/Makefile.in
similarity index 100%
rename from HostSupport/expat-2.2.10/examples/Makefile.in
rename to HostSupport/expat-2.3.0/examples/Makefile.in
diff --git a/HostSupport/expat-2.2.10/examples/elements.c b/HostSupport/expat-2.3.0/examples/elements.c
similarity index 100%
rename from HostSupport/expat-2.2.10/examples/elements.c
rename to HostSupport/expat-2.3.0/examples/elements.c
diff --git a/HostSupport/expat-2.2.10/examples/outline.c b/HostSupport/expat-2.3.0/examples/outline.c
similarity index 100%
rename from HostSupport/expat-2.2.10/examples/outline.c
rename to HostSupport/expat-2.3.0/examples/outline.c
diff --git a/HostSupport/expat-2.2.10/expat.pc.in b/HostSupport/expat-2.3.0/expat.pc.in
similarity index 100%
rename from HostSupport/expat-2.2.10/expat.pc.in
rename to HostSupport/expat-2.3.0/expat.pc.in
diff --git a/HostSupport/expat-2.2.10/expat_config.h.cmake b/HostSupport/expat-2.3.0/expat_config.h.cmake
similarity index 100%
rename from HostSupport/expat-2.2.10/expat_config.h.cmake
rename to HostSupport/expat-2.3.0/expat_config.h.cmake
diff --git a/HostSupport/expat-2.2.10/expat_config.h.in b/HostSupport/expat-2.3.0/expat_config.h.in
similarity index 100%
rename from HostSupport/expat-2.2.10/expat_config.h.in
rename to HostSupport/expat-2.3.0/expat_config.h.in
diff --git a/HostSupport/expat-2.2.10/fix-xmltest-log.sh b/HostSupport/expat-2.3.0/fix-xmltest-log.sh
similarity index 100%
rename from HostSupport/expat-2.2.10/fix-xmltest-log.sh
rename to HostSupport/expat-2.3.0/fix-xmltest-log.sh
diff --git a/HostSupport/expat-2.2.10/lib/Makefile.am b/HostSupport/expat-2.3.0/lib/Makefile.am
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/Makefile.am
rename to HostSupport/expat-2.3.0/lib/Makefile.am
diff --git a/HostSupport/expat-2.2.10/lib/Makefile.in b/HostSupport/expat-2.3.0/lib/Makefile.in
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/Makefile.in
rename to HostSupport/expat-2.3.0/lib/Makefile.in
diff --git a/HostSupport/expat-2.2.10/lib/ascii.h b/HostSupport/expat-2.3.0/lib/ascii.h
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/ascii.h
rename to HostSupport/expat-2.3.0/lib/ascii.h
diff --git a/HostSupport/expat-2.2.10/lib/asciitab.h b/HostSupport/expat-2.3.0/lib/asciitab.h
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/asciitab.h
rename to HostSupport/expat-2.3.0/lib/asciitab.h
diff --git a/HostSupport/expat-2.2.10/lib/expat.h b/HostSupport/expat-2.3.0/lib/expat.h
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/expat.h
rename to HostSupport/expat-2.3.0/lib/expat.h
diff --git a/HostSupport/expat-2.2.10/lib/expat_external.h b/HostSupport/expat-2.3.0/lib/expat_external.h
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/expat_external.h
rename to HostSupport/expat-2.3.0/lib/expat_external.h
diff --git a/HostSupport/expat-2.2.10/lib/iasciitab.h b/HostSupport/expat-2.3.0/lib/iasciitab.h
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/iasciitab.h
rename to HostSupport/expat-2.3.0/lib/iasciitab.h
diff --git a/HostSupport/expat-2.2.10/lib/internal.h b/HostSupport/expat-2.3.0/lib/internal.h
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/internal.h
rename to HostSupport/expat-2.3.0/lib/internal.h
diff --git a/HostSupport/expat-2.2.10/lib/latin1tab.h b/HostSupport/expat-2.3.0/lib/latin1tab.h
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/latin1tab.h
rename to HostSupport/expat-2.3.0/lib/latin1tab.h
diff --git a/HostSupport/expat-2.2.10/lib/libexpat.def b/HostSupport/expat-2.3.0/lib/libexpat.def
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/libexpat.def
rename to HostSupport/expat-2.3.0/lib/libexpat.def
diff --git a/HostSupport/expat-2.2.10/lib/libexpatw.def b/HostSupport/expat-2.3.0/lib/libexpatw.def
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/libexpatw.def
rename to HostSupport/expat-2.3.0/lib/libexpatw.def
diff --git a/HostSupport/expat-2.2.10/lib/nametab.h b/HostSupport/expat-2.3.0/lib/nametab.h
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/nametab.h
rename to HostSupport/expat-2.3.0/lib/nametab.h
diff --git a/HostSupport/expat-2.2.10/lib/siphash.h b/HostSupport/expat-2.3.0/lib/siphash.h
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/siphash.h
rename to HostSupport/expat-2.3.0/lib/siphash.h
diff --git a/HostSupport/expat-2.2.10/lib/utf8tab.h b/HostSupport/expat-2.3.0/lib/utf8tab.h
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/utf8tab.h
rename to HostSupport/expat-2.3.0/lib/utf8tab.h
diff --git a/HostSupport/expat-2.2.10/lib/winconfig.h b/HostSupport/expat-2.3.0/lib/winconfig.h
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/winconfig.h
rename to HostSupport/expat-2.3.0/lib/winconfig.h
diff --git a/HostSupport/expat-2.2.10/lib/xmlparse.c b/HostSupport/expat-2.3.0/lib/xmlparse.c
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/xmlparse.c
rename to HostSupport/expat-2.3.0/lib/xmlparse.c
diff --git a/HostSupport/expat-2.2.10/lib/xmlrole.c b/HostSupport/expat-2.3.0/lib/xmlrole.c
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/xmlrole.c
rename to HostSupport/expat-2.3.0/lib/xmlrole.c
diff --git a/HostSupport/expat-2.2.10/lib/xmlrole.h b/HostSupport/expat-2.3.0/lib/xmlrole.h
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/xmlrole.h
rename to HostSupport/expat-2.3.0/lib/xmlrole.h
diff --git a/HostSupport/expat-2.2.10/lib/xmltok.c b/HostSupport/expat-2.3.0/lib/xmltok.c
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/xmltok.c
rename to HostSupport/expat-2.3.0/lib/xmltok.c
diff --git a/HostSupport/expat-2.2.10/lib/xmltok.h b/HostSupport/expat-2.3.0/lib/xmltok.h
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/xmltok.h
rename to HostSupport/expat-2.3.0/lib/xmltok.h
diff --git a/HostSupport/expat-2.2.10/lib/xmltok_impl.c b/HostSupport/expat-2.3.0/lib/xmltok_impl.c
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/xmltok_impl.c
rename to HostSupport/expat-2.3.0/lib/xmltok_impl.c
diff --git a/HostSupport/expat-2.2.10/lib/xmltok_impl.h b/HostSupport/expat-2.3.0/lib/xmltok_impl.h
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/xmltok_impl.h
rename to HostSupport/expat-2.3.0/lib/xmltok_impl.h
diff --git a/HostSupport/expat-2.2.10/lib/xmltok_ns.c b/HostSupport/expat-2.3.0/lib/xmltok_ns.c
similarity index 100%
rename from HostSupport/expat-2.2.10/lib/xmltok_ns.c
rename to HostSupport/expat-2.3.0/lib/xmltok_ns.c
diff --git a/HostSupport/expat-2.2.10/m4/libtool.m4 b/HostSupport/expat-2.3.0/m4/libtool.m4
similarity index 100%
rename from HostSupport/expat-2.2.10/m4/libtool.m4
rename to HostSupport/expat-2.3.0/m4/libtool.m4
diff --git a/HostSupport/expat-2.2.10/m4/ltoptions.m4 b/HostSupport/expat-2.3.0/m4/ltoptions.m4
similarity index 100%
rename from HostSupport/expat-2.2.10/m4/ltoptions.m4
rename to HostSupport/expat-2.3.0/m4/ltoptions.m4
diff --git a/HostSupport/expat-2.2.10/m4/ltsugar.m4 b/HostSupport/expat-2.3.0/m4/ltsugar.m4
similarity index 100%
rename from HostSupport/expat-2.2.10/m4/ltsugar.m4
rename to HostSupport/expat-2.3.0/m4/ltsugar.m4
diff --git a/HostSupport/expat-2.2.10/m4/ltversion.m4 b/HostSupport/expat-2.3.0/m4/ltversion.m4
similarity index 100%
rename from HostSupport/expat-2.2.10/m4/ltversion.m4
rename to HostSupport/expat-2.3.0/m4/ltversion.m4
diff --git a/HostSupport/expat-2.2.10/m4/lt~obsolete.m4 b/HostSupport/expat-2.3.0/m4/lt~obsolete.m4
similarity index 100%
rename from HostSupport/expat-2.2.10/m4/lt~obsolete.m4
rename to HostSupport/expat-2.3.0/m4/lt~obsolete.m4
diff --git a/HostSupport/expat-2.2.10/run.sh.in b/HostSupport/expat-2.3.0/run.sh.in
similarity index 100%
rename from HostSupport/expat-2.2.10/run.sh.in
rename to HostSupport/expat-2.3.0/run.sh.in
diff --git a/HostSupport/expat-2.2.10/test-driver-wrapper.sh b/HostSupport/expat-2.3.0/test-driver-wrapper.sh
similarity index 100%
rename from HostSupport/expat-2.2.10/test-driver-wrapper.sh
rename to HostSupport/expat-2.3.0/test-driver-wrapper.sh
diff --git a/HostSupport/expat-2.2.10/tests/Makefile.am b/HostSupport/expat-2.3.0/tests/Makefile.am
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/Makefile.am
rename to HostSupport/expat-2.3.0/tests/Makefile.am
diff --git a/HostSupport/expat-2.2.10/tests/Makefile.in b/HostSupport/expat-2.3.0/tests/Makefile.in
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/Makefile.in
rename to HostSupport/expat-2.3.0/tests/Makefile.in
diff --git a/HostSupport/expat-2.2.10/tests/README.txt b/HostSupport/expat-2.3.0/tests/README.txt
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/README.txt
rename to HostSupport/expat-2.3.0/tests/README.txt
diff --git a/HostSupport/expat-2.2.10/tests/benchmark/Makefile.am b/HostSupport/expat-2.3.0/tests/benchmark/Makefile.am
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/benchmark/Makefile.am
rename to HostSupport/expat-2.3.0/tests/benchmark/Makefile.am
diff --git a/HostSupport/expat-2.2.10/tests/benchmark/Makefile.in b/HostSupport/expat-2.3.0/tests/benchmark/Makefile.in
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/benchmark/Makefile.in
rename to HostSupport/expat-2.3.0/tests/benchmark/Makefile.in
diff --git a/HostSupport/expat-2.2.10/tests/benchmark/README.txt b/HostSupport/expat-2.3.0/tests/benchmark/README.txt
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/benchmark/README.txt
rename to HostSupport/expat-2.3.0/tests/benchmark/README.txt
diff --git a/HostSupport/expat-2.2.10/tests/benchmark/benchmark.c b/HostSupport/expat-2.3.0/tests/benchmark/benchmark.c
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/benchmark/benchmark.c
rename to HostSupport/expat-2.3.0/tests/benchmark/benchmark.c
diff --git a/HostSupport/expat-2.2.10/tests/chardata.c b/HostSupport/expat-2.3.0/tests/chardata.c
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/chardata.c
rename to HostSupport/expat-2.3.0/tests/chardata.c
diff --git a/HostSupport/expat-2.2.10/tests/chardata.h b/HostSupport/expat-2.3.0/tests/chardata.h
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/chardata.h
rename to HostSupport/expat-2.3.0/tests/chardata.h
diff --git a/HostSupport/expat-2.2.10/tests/memcheck.c b/HostSupport/expat-2.3.0/tests/memcheck.c
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/memcheck.c
rename to HostSupport/expat-2.3.0/tests/memcheck.c
diff --git a/HostSupport/expat-2.2.10/tests/memcheck.h b/HostSupport/expat-2.3.0/tests/memcheck.h
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/memcheck.h
rename to HostSupport/expat-2.3.0/tests/memcheck.h
diff --git a/HostSupport/expat-2.2.10/tests/minicheck.c b/HostSupport/expat-2.3.0/tests/minicheck.c
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/minicheck.c
rename to HostSupport/expat-2.3.0/tests/minicheck.c
diff --git a/HostSupport/expat-2.2.10/tests/minicheck.h b/HostSupport/expat-2.3.0/tests/minicheck.h
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/minicheck.h
rename to HostSupport/expat-2.3.0/tests/minicheck.h
diff --git a/HostSupport/expat-2.2.10/tests/runtests.c b/HostSupport/expat-2.3.0/tests/runtests.c
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/runtests.c
rename to HostSupport/expat-2.3.0/tests/runtests.c
diff --git a/HostSupport/expat-2.2.10/tests/runtestspp.cpp b/HostSupport/expat-2.3.0/tests/runtestspp.cpp
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/runtestspp.cpp
rename to HostSupport/expat-2.3.0/tests/runtestspp.cpp
diff --git a/HostSupport/expat-2.2.10/tests/structdata.c b/HostSupport/expat-2.3.0/tests/structdata.c
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/structdata.c
rename to HostSupport/expat-2.3.0/tests/structdata.c
diff --git a/HostSupport/expat-2.2.10/tests/structdata.h b/HostSupport/expat-2.3.0/tests/structdata.h
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/structdata.h
rename to HostSupport/expat-2.3.0/tests/structdata.h
diff --git a/HostSupport/expat-2.2.10/tests/udiffer.py b/HostSupport/expat-2.3.0/tests/udiffer.py
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/udiffer.py
rename to HostSupport/expat-2.3.0/tests/udiffer.py
diff --git a/HostSupport/expat-2.2.10/tests/xmltest.log.expected b/HostSupport/expat-2.3.0/tests/xmltest.log.expected
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/xmltest.log.expected
rename to HostSupport/expat-2.3.0/tests/xmltest.log.expected
diff --git a/HostSupport/expat-2.2.10/tests/xmltest.sh b/HostSupport/expat-2.3.0/tests/xmltest.sh
similarity index 100%
rename from HostSupport/expat-2.2.10/tests/xmltest.sh
rename to HostSupport/expat-2.3.0/tests/xmltest.sh
diff --git a/HostSupport/expat-2.2.10/win32/MANIFEST.txt b/HostSupport/expat-2.3.0/win32/MANIFEST.txt
similarity index 100%
rename from HostSupport/expat-2.2.10/win32/MANIFEST.txt
rename to HostSupport/expat-2.3.0/win32/MANIFEST.txt
diff --git a/HostSupport/expat-2.2.10/win32/README.txt b/HostSupport/expat-2.3.0/win32/README.txt
similarity index 100%
rename from HostSupport/expat-2.2.10/win32/README.txt
rename to HostSupport/expat-2.3.0/win32/README.txt
diff --git a/HostSupport/expat-2.2.10/win32/build_expat_iss.bat b/HostSupport/expat-2.3.0/win32/build_expat_iss.bat
similarity index 100%
rename from HostSupport/expat-2.2.10/win32/build_expat_iss.bat
rename to HostSupport/expat-2.3.0/win32/build_expat_iss.bat
diff --git a/HostSupport/expat-2.2.10/win32/expat.iss b/HostSupport/expat-2.3.0/win32/expat.iss
similarity index 100%
rename from HostSupport/expat-2.2.10/win32/expat.iss
rename to HostSupport/expat-2.3.0/win32/expat.iss
diff --git a/HostSupport/expat-2.2.10/xmlwf/Makefile.am b/HostSupport/expat-2.3.0/xmlwf/Makefile.am
similarity index 100%
rename from HostSupport/expat-2.2.10/xmlwf/Makefile.am
rename to HostSupport/expat-2.3.0/xmlwf/Makefile.am
diff --git a/HostSupport/expat-2.2.10/xmlwf/Makefile.in b/HostSupport/expat-2.3.0/xmlwf/Makefile.in
similarity index 100%
rename from HostSupport/expat-2.2.10/xmlwf/Makefile.in
rename to HostSupport/expat-2.3.0/xmlwf/Makefile.in
diff --git a/HostSupport/expat-2.2.10/xmlwf/codepage.c b/HostSupport/expat-2.3.0/xmlwf/codepage.c
similarity index 100%
rename from HostSupport/expat-2.2.10/xmlwf/codepage.c
rename to HostSupport/expat-2.3.0/xmlwf/codepage.c
diff --git a/HostSupport/expat-2.2.10/xmlwf/codepage.h b/HostSupport/expat-2.3.0/xmlwf/codepage.h
similarity index 100%
rename from HostSupport/expat-2.2.10/xmlwf/codepage.h
rename to HostSupport/expat-2.3.0/xmlwf/codepage.h
diff --git a/HostSupport/expat-2.2.10/xmlwf/ct.c b/HostSupport/expat-2.3.0/xmlwf/ct.c
similarity index 100%
rename from HostSupport/expat-2.2.10/xmlwf/ct.c
rename to HostSupport/expat-2.3.0/xmlwf/ct.c
diff --git a/HostSupport/expat-2.2.10/xmlwf/filemap.h b/HostSupport/expat-2.3.0/xmlwf/filemap.h
similarity index 100%
rename from HostSupport/expat-2.2.10/xmlwf/filemap.h
rename to HostSupport/expat-2.3.0/xmlwf/filemap.h
diff --git a/HostSupport/expat-2.2.10/xmlwf/readfilemap.c b/HostSupport/expat-2.3.0/xmlwf/readfilemap.c
similarity index 100%
rename from HostSupport/expat-2.2.10/xmlwf/readfilemap.c
rename to HostSupport/expat-2.3.0/xmlwf/readfilemap.c
diff --git a/HostSupport/expat-2.2.10/xmlwf/unixfilemap.c b/HostSupport/expat-2.3.0/xmlwf/unixfilemap.c
similarity index 100%
rename from HostSupport/expat-2.2.10/xmlwf/unixfilemap.c
rename to HostSupport/expat-2.3.0/xmlwf/unixfilemap.c
diff --git a/HostSupport/expat-2.2.10/xmlwf/win32filemap.c b/HostSupport/expat-2.3.0/xmlwf/win32filemap.c
similarity index 100%
rename from HostSupport/expat-2.2.10/xmlwf/win32filemap.c
rename to HostSupport/expat-2.3.0/xmlwf/win32filemap.c
diff --git a/HostSupport/expat-2.2.10/xmlwf/xmlfile.c b/HostSupport/expat-2.3.0/xmlwf/xmlfile.c
similarity index 100%
rename from HostSupport/expat-2.2.10/xmlwf/xmlfile.c
rename to HostSupport/expat-2.3.0/xmlwf/xmlfile.c
diff --git a/HostSupport/expat-2.2.10/xmlwf/xmlfile.h b/HostSupport/expat-2.3.0/xmlwf/xmlfile.h
similarity index 100%
rename from HostSupport/expat-2.2.10/xmlwf/xmlfile.h
rename to HostSupport/expat-2.3.0/xmlwf/xmlfile.h
diff --git a/HostSupport/expat-2.2.10/xmlwf/xmlmime.c b/HostSupport/expat-2.3.0/xmlwf/xmlmime.c
similarity index 100%
rename from HostSupport/expat-2.2.10/xmlwf/xmlmime.c
rename to HostSupport/expat-2.3.0/xmlwf/xmlmime.c
diff --git a/HostSupport/expat-2.2.10/xmlwf/xmlmime.h b/HostSupport/expat-2.3.0/xmlwf/xmlmime.h
similarity index 100%
rename from HostSupport/expat-2.2.10/xmlwf/xmlmime.h
rename to HostSupport/expat-2.3.0/xmlwf/xmlmime.h
diff --git a/HostSupport/expat-2.2.10/xmlwf/xmltchar.h b/HostSupport/expat-2.3.0/xmlwf/xmltchar.h
similarity index 100%
rename from HostSupport/expat-2.2.10/xmlwf/xmltchar.h
rename to HostSupport/expat-2.3.0/xmlwf/xmltchar.h
diff --git a/HostSupport/expat-2.2.10/xmlwf/xmlwf.c b/HostSupport/expat-2.3.0/xmlwf/xmlwf.c
similarity index 100%
rename from HostSupport/expat-2.2.10/xmlwf/xmlwf.c
rename to HostSupport/expat-2.3.0/xmlwf/xmlwf.c
diff --git a/HostSupport/expat-2.2.10/xmlwf/xmlwf_helpgen.py b/HostSupport/expat-2.3.0/xmlwf/xmlwf_helpgen.py
similarity index 100%
rename from HostSupport/expat-2.2.10/xmlwf/xmlwf_helpgen.py
rename to HostSupport/expat-2.3.0/xmlwf/xmlwf_helpgen.py
diff --git a/HostSupport/expat-2.2.10/xmlwf/xmlwf_helpgen.sh b/HostSupport/expat-2.3.0/xmlwf/xmlwf_helpgen.sh
similarity index 100%
rename from HostSupport/expat-2.2.10/xmlwf/xmlwf_helpgen.sh
rename to HostSupport/expat-2.3.0/xmlwf/xmlwf_helpgen.sh