Update to Go 1.3.1
Merge pull request #937 from andybons/patch-3

Update to Go 1.3.1