Fix URL sanitisation regexp being too greedy
Merge pull request #2401 from cs278/fix-url-sanitisation

Fix URL sanitisation regexp being too greedy