reader: links and markup
Merge branch 'master' into features