Add back support for whitespaces in URLs removed in aa4ac33a
Merge branch 'fix_whitespace_in_url'