Use old style split of globpath
Merge upstream update