Merge pull request #1997 from rg3/simplify-url_basename