Merge branches 'simplexml-comments' and 'simplexml-xpath'