quote parameters if win command processor launched with extra switches (e.g. /D)
fix testdata; restore again ExpectedHighlightingData
Merge remote-tracking branch 'origin/master'