Merge branch 'simplexml-comments'
Merge branch 'xpath-scope'
Revert "SimpleXML attribute mismatch"

This reverts commit e6bbf57d811c0d23baf8358083a0f838a3bf520b.