Merge branch 'experimental' into controllerfixup

.travis.yml

@@ -43,6 +43,7 @@ notifications:
       - "irc.esper.net#bitblot"
     skip_join: true
     use_notice: true
+    on_success: change
     template:
       #- "[%{commit}: %{author}] %{message}"
       #- "%{build_url}"

Aquaria/ScriptInterface.cpp

@@ -9611,7 +9611,7 @@ luaFunc(loadXMLTable)
 
 	tinyxml2::XMLDocument xml;
 	tinyxml2::XMLError err = readXML(fn, xml);
-	if(err != tinyxml2::XML_NO_ERROR)
+	if(err != tinyxml2::XML_SUCCESS)
 	{
 		lua_pushboolean(L, false);
 		lua_pushinteger(L, err);