XPath magic is hurd
Merge branch 'v3'