Don't catch trailing html tags, like <br>, in HTML anchor
Merge branch '4.0/makeclicky-html-in-anchor' into 4.0-trunk