Prevent empty $path from getting treated as relative path.
Merge remote-tracking branch 'upstream/master'