Add GOPATH/bin to PATH
Fix GO path merge
Merge commit '05894d7224d4ce7535596c783010f9976e9d5142'