Merge pull request #1714 from lynxis/libxml2_nonparallel