Merge "Add bool and integer support to XML parser"