fix script paths and executables after allowing forks
Merge remote-tracking branch 'upstream/master'