XPathParser: updated regexps
Synced from master
Synced from master