Merge branch 'master' of git.carlh.net:git/libcxml