Convert from OS-independent relative path
joinpath: Newer version
Merge branch 'path' into HEAD

Conflicts:
	misc.py