path for opening local file changed
Merge remote-tracking branch 'upstream/master'