Attempt #2 at fixing boost xml parser instability
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-Project into testing