Merge pull request #5780 from jefferyto/golang