Fix the line wrapping
Corrections

If we cut a URL, the link will be broken.
Merge branch '2.11' into 3.0