fix for external links without caption
wiki publisher (url mapping)
Merge branch 'master' into stable