fix parsing of text links
Merge branch 'master' into RELEASE_20140325