Pull changes to remove dependency on custom Go 1.2