Update xml
Merge branch 'master' of github.com:quietust/dfhack-40d

Conflicts:
	library/xml