Merge pull request #2388 from pyhalov/golang