From b1e3c1088ca84fa30c2e548f8cd2258155bc3e8d Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 19 Oct 2016 09:51:48 -0400
Subject: [PATCH 1/2] Give loadfile() result a better name for tracebacks

---
 library/lua/dfhack.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/library/lua/dfhack.lua b/library/lua/dfhack.lua
index 900607c08..340b6ce64 100644
--- a/library/lua/dfhack.lua
+++ b/library/lua/dfhack.lua
@@ -543,23 +543,23 @@ function dfhack.run_script_with_env(envVars, name, flags, ...)
     end
     env.dfhack_flags = flags
     env.moduleMode = flags.module
-    local f
+    local script_code
     local perr
     local time = dfhack.filesystem.mtime(file)
     if time == scripts[file].mtime and scripts[file].run then
-        f = scripts[file].run
+        script_code = scripts[file].run
     else
         --reload
-        f, perr = loadfile(file, 't', env)
-        if not f then
+        script_code, perr = loadfile(file, 't', env)
+        if not script_code then
             error(perr)
         end
         -- avoid updating mtime if the script failed to load
         scripts[file].mtime = time
     end
     scripts[file].env = env
-    scripts[file].run = f
-    return f(...), env
+    scripts[file].run = script_code
+    return script_code(...), env
 end
 
 local function _run_command(...)

From b19a0b4305331a98e130f4085902d88c3cbad097 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 19 Oct 2016 09:52:15 -0400
Subject: [PATCH 2/2] Update scripts, xml

Fixes #1005
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index 693d58c85..81e2cf023 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 693d58c8588120ad0a179bdd154cf0ce6035c782
+Subproject commit 81e2cf023422ad6f01061db12586a0589ef6eac5
diff --git a/scripts b/scripts
index de9962079..b285334a8 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit de996207994e4ce3e221c010c9cc042b06620a2e
+Subproject commit b285334a8a91c0b43bac9d3e362b95fcbfa472c7