[dev.typeparams] merge master into dev.typeparams

Change-Id: I0e56b7b659ac84e14121325c560a242554196808

diff --cc src/cmd/compile/fmtmap_test.go
Simple merge

diff --cc src/cmd/compile/internal/gc/main.go
Simple merge

diff --cc src/cmd/compile/internal/gc/noder.go
index 9685794ec4f5d0deadd70ae966c863b50f380622,67d24ef0bc70672be7c579b9ee211066b34d80c6..14bacc14a8b39845683aa0baaa900d1854a28b07
--- 1/src/cmd/compile/internal/gc/noder.go
--- 2/src/cmd/compile/internal/gc/noder.go
+++ b/src/cmd/compile/internal/gc/noder.go
@@@ -12,12 -11,11 +12,13 @@@ import 
        "runtime"
        "strconv"
        "strings"
+       "unicode"
        "unicode/utf8"
  
 +      "cmd/compile/internal/importer"
        "cmd/compile/internal/syntax"
        "cmd/compile/internal/types"
 +      "cmd/compile/internal/types2"
        "cmd/internal/obj"
        "cmd/internal/objabi"
        "cmd/internal/src"