Merge pull request #12702 from colemanw/urls