Produce shorter regexps for XPathParser
Merge branch 'master' into tmp