Fix compiling on Mac OSX (and probably on Linux)

 - local variable GitBinaryPath not defined ifndef PLATFORM_WINDOWS
 - minor problem with /* comments inside /* comments
Merge branch 'origin/4.1'