Added go1.1 stuff.