Merge pull request #10157 from annando/empty-basepath