Merge pull request #6709 from annando/urlpath