Discriminate between XPath and CSS selectors automatically.
Merge branch 'develop'