Merge "Don't double escape in Linker::formatLinksInComment"