fixes latent bugs in go and defer R=r OCL=23613 CL=23613
Attach a file by drag & drop or click to upload
