replace "$dir$ + $path$" with Path.Combine($dir$, $path$)
locations which add other stuff
Merge pull request #1560 from bergerjac/dir-plus-path-replace

replace "$dir$ + $path$" with Path.Combine($dir$, $path$)