* Fix rendering of URLs with hashes and underscores.
Merge branch 'url'