Modified context-path to get the information from PVS rather than use the
cached value.
Minor fix to short-file-name
Merge remote-tracking branch 'origin/master'