Fixing path problems
Merge branch 'gpnx-stable-linux' into gpnx-win