url and anchor text links
Merge branch 'bugfixes' into dev