Fix #2058 Add square brackets to url characters
Merge pull request #2061 from Gared/url_square_brackets

Fix #2058 Add square brackets to url characters