diff --git a/cmd/protoc-gen-go/main.go b/cmd/protoc-gen-go/main.go
index 28745ae..893f3ed 100644
--- a/cmd/protoc-gen-go/main.go
+++ b/cmd/protoc-gen-go/main.go
@@ -744,6 +744,19 @@
 }
 
 func genExtension(gen *protogen.Plugin, g *protogen.GeneratedFile, f *File, extension *protogen.Extension) {
+	// Special case for proto2 message sets: If this extension is extending
+	// proto2.bridge.MessageSet, and its final name component is "message_set_extension",
+	// then drop that last component.
+	//
+	// TODO: This should be implemented in the text formatter rather than the generator.
+	// In addition, the situation for when to apply this special case is implemented
+	// differently in other languages:
+	// https://github.com/google/protobuf/blob/aff10976/src/google/protobuf/text_format.cc#L1560
+	name := extension.Desc.FullName()
+	if isExtensionMessageSetElement(gen, extension) {
+		name = name.Parent()
+	}
+
 	g.P("var ", extensionVar(f, extension), " = &", protogen.GoIdent{
 		GoImportPath: protoPackage,
 		GoName:       "ExtensionDesc",
@@ -755,13 +768,19 @@
 	}
 	g.P("ExtensionType: (", goType, ")(nil),")
 	g.P("Field: ", extension.Desc.Number(), ",")
-	g.P("Name: ", strconv.Quote(string(extension.Desc.FullName())), ",")
+	g.P("Name: ", strconv.Quote(string(name)), ",")
 	g.P("Tag: ", strconv.Quote(fieldProtobufTag(extension)), ",")
 	g.P("Filename: ", strconv.Quote(f.Desc.Path()), ",")
 	g.P("}")
 	g.P()
 }
 
+func isExtensionMessageSetElement(gen *protogen.Plugin, extension *protogen.Extension) bool {
+	return extension.ParentMessage != nil &&
+		messageOptions(gen, extension.ExtendedType).GetMessageSetWireFormat() &&
+		extension.Desc.Name() == "message_set_extension"
+}
+
 // extensionVar returns the var holding the ExtensionDesc for an extension.
 func extensionVar(f *File, extension *protogen.Extension) protogen.GoIdent {
 	name := "E_"
@@ -783,11 +802,22 @@
 	}
 
 	g.P("func init() {")
+	for _, enum := range f.allEnums {
+		name := enum.GoIdent.GoName
+		g.P(protogen.GoIdent{
+			GoImportPath: protoPackage,
+			GoName:       "RegisterEnum",
+		}, fmt.Sprintf("(%q, %s_name, %s_value)", enumRegistryName(enum), name, name))
+	}
 	for _, message := range f.allMessages {
 		if message.Desc.IsMapEntry() {
 			continue
 		}
 
+		for _, extension := range message.Extensions {
+			genRegisterExtension(gen, g, f, extension)
+		}
+
 		name := message.GoIdent.GoName
 		g.P(protogen.GoIdent{
 			GoImportPath: protoPackage,
@@ -815,23 +845,30 @@
 			}, fmt.Sprintf("((%v)(nil), %q)", goType, typeName))
 		}
 	}
-	for _, enum := range f.allEnums {
-		name := enum.GoIdent.GoName
-		g.P(protogen.GoIdent{
-			GoImportPath: protoPackage,
-			GoName:       "RegisterEnum",
-		}, fmt.Sprintf("(%q, %s_name, %s_value)", enumRegistryName(enum), name, name))
-	}
-	for _, extension := range f.allExtensions {
-		g.P(protogen.GoIdent{
-			GoImportPath: protoPackage,
-			GoName:       "RegisterExtension",
-		}, "(", extensionVar(f, extension), ")")
+	for _, extension := range f.Extensions {
+		genRegisterExtension(gen, g, f, extension)
 	}
 	g.P("}")
 	g.P()
 }
 
+func genRegisterExtension(gen *protogen.Plugin, g *protogen.GeneratedFile, f *File, extension *protogen.Extension) {
+	g.P(protogen.GoIdent{
+		GoImportPath: protoPackage,
+		GoName:       "RegisterExtension",
+	}, "(", extensionVar(f, extension), ")")
+	if isExtensionMessageSetElement(gen, extension) {
+		goType, pointer := fieldGoType(g, extension)
+		if pointer {
+			goType = "*" + goType
+		}
+		g.P(protogen.GoIdent{
+			GoImportPath: protoPackage,
+			GoName:       "RegisterMessageSetType",
+		}, "((", goType, ")(nil), ", extension.Desc.Number(), ",", strconv.Quote(string(extension.Desc.FullName().Parent())), ")")
+	}
+}
+
 func genComment(g *protogen.GeneratedFile, f *File, path []int32) (hasComment bool) {
 	for _, loc := range f.locationMap[pathKey(path)] {
 		if loc.LeadingComments == nil {
diff --git a/cmd/protoc-gen-go/testdata/comments/comments.pb.go b/cmd/protoc-gen-go/testdata/comments/comments.pb.go
index 39fb376..0f24301 100644
--- a/cmd/protoc-gen-go/testdata/comments/comments.pb.go
+++ b/cmd/protoc-gen-go/testdata/comments/comments.pb.go
@@ -226,14 +226,14 @@
 func init() { proto.RegisterFile("comments/comments.proto", fileDescriptor_885e8293f1fab554) }
 
 var fileDescriptor_885e8293f1fab554 = []byte{
-	// 135 bytes of a gzipped FileDescriptorProto
+	// 139 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4f, 0xce, 0xcf, 0xcd,
 	0x4d, 0xcd, 0x2b, 0x29, 0xd6, 0x87, 0x31, 0xf4, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0xc4, 0xd3,
 	0xf3, 0xc1, 0x0c, 0x08, 0x37, 0x59, 0x0f, 0x26, 0xad, 0xa4, 0xc2, 0xc5, 0xe1, 0x9b, 0x5a, 0x5c,
 	0x9c, 0x98, 0x9e, 0x6a, 0x28, 0xc5, 0xcd, 0xc5, 0x09, 0x63, 0x3b, 0x22, 0x73, 0x9c, 0x90, 0x54,
-	0x19, 0x21, 0x49, 0x18, 0x21, 0xab, 0x32, 0x72, 0x72, 0xb2, 0x8d, 0xb2, 0x4e, 0xcf, 0xcf, 0x4f,
-	0xcf, 0x49, 0xd5, 0x4b, 0xcf, 0xcf, 0x49, 0xcc, 0x4b, 0xd7, 0xcb, 0x2f, 0x4a, 0xd7, 0x07, 0x5b,
-	0xa8, 0x9f, 0x9c, 0x9b, 0x02, 0x61, 0x25, 0xeb, 0xa6, 0xa7, 0xe6, 0xe9, 0xa6, 0xe7, 0xeb, 0x97,
-	0xa4, 0x16, 0x97, 0xa4, 0x24, 0x96, 0x24, 0xc2, 0x5d, 0x0a, 0x08, 0x00, 0x00, 0xff, 0xff, 0x2e,
-	0x72, 0xe4, 0xcc, 0xbd, 0x00, 0x00, 0x00,
+	0x19, 0x21, 0x49, 0x18, 0x21, 0xab, 0x32, 0x72, 0x72, 0x72, 0x8e, 0x72, 0x4c, 0xcf, 0x2c, 0xc9,
+	0x28, 0x4d, 0x02, 0x19, 0xaf, 0x9f, 0x9e, 0x9f, 0x93, 0x98, 0x97, 0xae, 0x0f, 0xb6, 0x30, 0xa9,
+	0x34, 0x4d, 0xbf, 0xcc, 0x48, 0x3f, 0x39, 0x37, 0x05, 0xc2, 0x4f, 0xd6, 0x4d, 0x4f, 0xcd, 0xd3,
+	0x4d, 0xcf, 0xd7, 0x2f, 0x49, 0x2d, 0x2e, 0x49, 0x49, 0x2c, 0x49, 0x84, 0xbb, 0x17, 0x10, 0x00,
+	0x00, 0xff, 0xff, 0x6d, 0x1e, 0x4c, 0x2d, 0xc3, 0x00, 0x00, 0x00,
 }
diff --git a/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go b/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go
index e820c3b..fb87120 100644
--- a/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go
+++ b/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go
@@ -83,25 +83,25 @@
 }
 
 func init() {
-	proto.RegisterType((*DeprecatedMessage)(nil), "goproto.protoc.comments.DeprecatedMessage")
 	proto.RegisterEnum("goproto.protoc.comments.DeprecatedEnum", DeprecatedEnum_name, DeprecatedEnum_value)
+	proto.RegisterType((*DeprecatedMessage)(nil), "goproto.protoc.comments.DeprecatedMessage")
 }
 
 func init() { proto.RegisterFile("comments/deprecated.proto", fileDescriptor_0336e614ee2de5f7) }
 
 var fileDescriptor_0336e614ee2de5f7 = []byte{
-	// 202 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x8e, 0x31, 0x4b, 0x04, 0x31,
-	0x10, 0x85, 0x9d, 0x14, 0xa2, 0x29, 0xf4, 0x4c, 0x63, 0xbc, 0x4a, 0xac, 0x0e, 0x61, 0x93, 0xc2,
-	0x4e, 0x1b, 0x3d, 0x37, 0xd7, 0x09, 0x72, 0x58, 0xd9, 0x48, 0x4c, 0xc6, 0x41, 0xd8, 0x64, 0x96,
-	0x4d, 0xfc, 0x6f, 0xfe, 0x3c, 0x71, 0x97, 0xbd, 0xed, 0xde, 0xe3, 0x7d, 0x3c, 0x3e, 0x79, 0x15,
-	0x38, 0x25, 0xcc, 0xb5, 0xd8, 0x88, 0xfd, 0x80, 0xc1, 0x57, 0x8c, 0xa6, 0x1f, 0xb8, 0xb2, 0xba,
-	0x24, 0x1e, 0xc3, 0x54, 0x83, 0x99, 0xc9, 0x9b, 0x9d, 0xbc, 0x68, 0x0f, 0xf0, 0x0b, 0x96, 0xe2,
-	0x09, 0x55, 0x23, 0x57, 0xcb, 0xc3, 0xc7, 0xd7, 0x37, 0x76, 0x51, 0xc3, 0x35, 0x6c, 0x4e, 0xb7,
-	0x42, 0xc3, 0xfe, 0x7c, 0xd9, 0x76, 0xff, 0xd3, 0xbd, 0xd0, 0x70, 0xbb, 0x91, 0x67, 0xcb, 0x8f,
-	0xcb, 0x3f, 0x49, 0x29, 0x29, 0x5b, 0xf7, 0xba, 0x77, 0xcf, 0x4f, 0x6f, 0xae, 0x5d, 0x1d, 0xad,
-	0xc5, 0x09, 0xac, 0x85, 0x86, 0xed, 0xe3, 0xfb, 0x03, 0x31, 0x53, 0x87, 0x86, 0xb8, 0xf3, 0x99,
-	0x0c, 0x0f, 0x64, 0x47, 0x2d, 0x1b, 0x52, 0x9c, 0x52, 0x68, 0x08, 0x73, 0x43, 0x6c, 0x2b, 0x96,
-	0x1a, 0x7d, 0xf5, 0x76, 0x16, 0xfe, 0x05, 0xf8, 0x3c, 0x1e, 0x99, 0xbb, 0xbf, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0x58, 0x8a, 0xbc, 0xc2, 0xf0, 0x00, 0x00, 0x00,
+	// 206 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4c, 0xce, 0xcf, 0xcd,
+	0x4d, 0xcd, 0x2b, 0x29, 0xd6, 0x4f, 0x49, 0x2d, 0x28, 0x4a, 0x4d, 0x4e, 0x2c, 0x49, 0x4d, 0xd1,
+	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x4f, 0xcf, 0x07, 0x33, 0x20, 0xdc, 0x64, 0x3d, 0x98,
+	0x4a, 0x25, 0x37, 0x2e, 0x41, 0x17, 0xb8, 0x62, 0xdf, 0xd4, 0xe2, 0xe2, 0xc4, 0xf4, 0x54, 0x21,
+	0x5d, 0x2e, 0x01, 0x84, 0x09, 0xf1, 0x69, 0x99, 0xa9, 0x39, 0x29, 0x12, 0x8c, 0x0a, 0x8c, 0x1a,
+	0x9c, 0x4e, 0x4c, 0x12, 0x8c, 0x41, 0xfc, 0x08, 0x39, 0x37, 0x90, 0x94, 0x15, 0x93, 0x04, 0xa3,
+	0x96, 0x06, 0x17, 0x1f, 0xc2, 0x1c, 0xd7, 0xbc, 0xd2, 0x5c, 0x21, 0x21, 0x2e, 0x2e, 0x17, 0xd7,
+	0x80, 0x20, 0x57, 0x67, 0xc7, 0x10, 0x57, 0x17, 0x01, 0x06, 0x29, 0x26, 0x0e, 0x46, 0x29, 0x26,
+	0x09, 0x46, 0x27, 0xb7, 0x28, 0xc7, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0x90, 0x23, 0xf4, 0xd3,
+	0xf3, 0x73, 0x12, 0xf3, 0xd2, 0xf5, 0xc1, 0xce, 0x4a, 0x2a, 0x4d, 0xd3, 0x2f, 0x33, 0xd2, 0x4f,
+	0xce, 0x4d, 0x81, 0xf0, 0x93, 0x75, 0xd3, 0x53, 0xf3, 0x74, 0xd3, 0xf3, 0xf5, 0x4b, 0x52, 0x8b,
+	0x4b, 0x52, 0x12, 0x4b, 0x12, 0xf5, 0x61, 0xce, 0xde, 0xc1, 0xc8, 0x98, 0xc4, 0x06, 0x56, 0x63,
+	0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x39, 0xab, 0x43, 0x93, 0xf6, 0x00, 0x00, 0x00,
 }
diff --git a/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go b/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go
index 8bbe3f2..64b5383 100644
--- a/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go
+++ b/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go
@@ -124,7 +124,7 @@
 func init() { proto.RegisterFile("extensions/base/base.proto", fileDescriptor_aebb28f8d5a04466) }
 
 var fileDescriptor_aebb28f8d5a04466 = []byte{
-	// 198 bytes of a gzipped FileDescriptorProto
+	// 204 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4a, 0xad, 0x28, 0x49,
 	0xcd, 0x2b, 0xce, 0xcc, 0xcf, 0x2b, 0xd6, 0x4f, 0x4a, 0x2c, 0x4e, 0x05, 0x13, 0x7a, 0x05, 0x45,
 	0xf9, 0x25, 0xf9, 0x42, 0xb2, 0xe9, 0xf9, 0x60, 0x06, 0x84, 0x9b, 0xac, 0x07, 0x57, 0xaa, 0x07,
@@ -133,9 +133,9 @@
 	0x04, 0xe1, 0x68, 0xb1, 0x70, 0xb0, 0x08, 0x70, 0x69, 0x71, 0x70, 0x08, 0x08, 0x34, 0x34, 0x34,
 	0x34, 0x30, 0x29, 0x69, 0x73, 0x49, 0x43, 0x35, 0x04, 0xa7, 0x96, 0x84, 0x67, 0x16, 0xa5, 0xba,
 	0xe5, 0x17, 0xe5, 0x26, 0x96, 0x40, 0xc5, 0xb4, 0x38, 0x38, 0x52, 0x04, 0xfe, 0xff, 0xff, 0xff,
-	0x9f, 0xdd, 0x8a, 0x89, 0x83, 0xd1, 0xc9, 0x25, 0xca, 0x29, 0x3d, 0x3f, 0x3f, 0x3d, 0x27, 0x55,
-	0x2f, 0x3d, 0x3f, 0x27, 0x31, 0x2f, 0x5d, 0x2f, 0xbf, 0x28, 0x5d, 0x1f, 0xec, 0x18, 0xfd, 0xe4,
-	0xdc, 0x14, 0x08, 0x2b, 0x59, 0x37, 0x3d, 0x35, 0x4f, 0x37, 0x3d, 0x5f, 0xbf, 0x24, 0xb5, 0xb8,
-	0x24, 0x25, 0xb1, 0x24, 0x51, 0x1f, 0xcd, 0x47, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5f, 0x09,
-	0xf0, 0xbd, 0xe3, 0x00, 0x00, 0x00,
+	0x9f, 0xdd, 0x8a, 0x89, 0x83, 0xd1, 0xc9, 0x2b, 0xca, 0x23, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49,
+	0x2f, 0x39, 0x3f, 0x57, 0x3f, 0x3d, 0x3f, 0x27, 0x31, 0x2f, 0x5d, 0x1f, 0xec, 0x98, 0xa4, 0xd2,
+	0x34, 0xfd, 0x32, 0x23, 0xfd, 0xe4, 0xdc, 0x14, 0x08, 0x3f, 0x59, 0x37, 0x3d, 0x35, 0x4f, 0x37,
+	0x3d, 0x5f, 0xbf, 0x24, 0xb5, 0xb8, 0x24, 0x25, 0xb1, 0x24, 0x51, 0x1f, 0xcd, 0x5f, 0x80, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0x1c, 0x75, 0xde, 0x5a, 0xe9, 0x00, 0x00, 0x00,
 }
diff --git a/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go b/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
index 6eadbc4..e205a86 100644
--- a/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
+++ b/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
@@ -365,12 +365,12 @@
 
 var xxx_messageInfo_MessageSetWireFormatExtension proto.InternalMessageInfo
 
-var E_MessageSetWireFormatExtension_MessageSetField = &proto.ExtensionDesc{
+var E_MessageSetWireFormatExtension_MessageSetExtension = &proto.ExtensionDesc{
 	ExtendedType:  (*base.MessageSetWireFormatMessage)(nil),
 	ExtensionType: (*MessageSetWireFormatExtension)(nil),
 	Field:         100,
-	Name:          "goproto.protoc.extension.ext.MessageSetWireFormatExtension.message_set_field",
-	Tag:           "bytes,100,opt,name=message_set_field",
+	Name:          "goproto.protoc.extension.ext.MessageSetWireFormatExtension",
+	Tag:           "bytes,100,opt,name=message_set_extension",
 	Filename:      "extensions/ext/ext.proto",
 }
 
@@ -735,18 +735,19 @@
 }
 
 func init() {
+	proto.RegisterEnum("goproto.protoc.extension.ext.Enum", Enum_name, Enum_value)
 	proto.RegisterType((*Message)(nil), "goproto.protoc.extension.ext.Message")
 	proto.RegisterType((*Message_M)(nil), "goproto.protoc.extension.ext.Message.M")
 	proto.RegisterType((*ExtensionGroup)(nil), "goproto.protoc.extension.ext.ExtensionGroup")
+	proto.RegisterExtension(E_ExtendingMessage_ExtendingMessageString)
+	proto.RegisterExtension(E_ExtendingMessage_ExtendingMessageSubmessage)
 	proto.RegisterType((*ExtendingMessage)(nil), "goproto.protoc.extension.ext.ExtendingMessage")
 	proto.RegisterType((*ExtendingMessage_ExtendingMessageSubmessage)(nil), "goproto.protoc.extension.ext.ExtendingMessage.ExtendingMessageSubmessage")
 	proto.RegisterType((*RepeatedGroup)(nil), "goproto.protoc.extension.ext.RepeatedGroup")
 	proto.RegisterType((*Extendable)(nil), "goproto.protoc.extension.ext.Extendable")
+	proto.RegisterExtension(E_MessageSetWireFormatExtension_MessageSetExtension)
+	proto.RegisterMessageSetType((*MessageSetWireFormatExtension)(nil), 100, "goproto.protoc.extension.ext.MessageSetWireFormatExtension")
 	proto.RegisterType((*MessageSetWireFormatExtension)(nil), "goproto.protoc.extension.ext.MessageSetWireFormatExtension")
-	proto.RegisterEnum("goproto.protoc.extension.ext.Enum", Enum_name, Enum_value)
-	proto.RegisterExtension(E_ExtendingMessage_ExtendingMessageString)
-	proto.RegisterExtension(E_ExtendingMessage_ExtendingMessageSubmessage)
-	proto.RegisterExtension(E_MessageSetWireFormatExtension_MessageSetField)
 	proto.RegisterExtension(E_ExtensionBool)
 	proto.RegisterExtension(E_ExtensionEnum)
 	proto.RegisterExtension(E_ExtensionInt32)
@@ -792,75 +793,75 @@
 func init() { proto.RegisterFile("extensions/ext/ext.proto", fileDescriptor_bf470ef4907b23cb) }
 
 var fileDescriptor_bf470ef4907b23cb = []byte{
-	// 1105 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x98, 0x5b, 0x6f, 0xe3, 0x44,
-	0x14, 0xc7, 0x99, 0x24, 0xbb, 0xcd, 0x0e, 0x4d, 0x9b, 0x18, 0xb1, 0x44, 0x51, 0x91, 0x46, 0x91,
-	0xd0, 0x0e, 0x85, 0x75, 0xa5, 0x10, 0x45, 0xc2, 0x3c, 0x51, 0x68, 0xd1, 0x3e, 0x44, 0x08, 0x57,
-	0x55, 0xbb, 0xcb, 0x43, 0x70, 0xea, 0xa9, 0x31, 0x38, 0x9e, 0xe2, 0x0b, 0x1b, 0x1e, 0x58, 0x45,
-	0x7c, 0x02, 0xbe, 0x03, 0xcf, 0xdc, 0x6f, 0xcb, 0xfd, 0x09, 0x09, 0x5e, 0xf9, 0x44, 0x68, 0x66,
-	0x7c, 0x19, 0x3b, 0x69, 0x36, 0xe3, 0x87, 0x56, 0x93, 0xb1, 0xf3, 0x3b, 0xc7, 0xff, 0x73, 0xe2,
-	0xff, 0xb1, 0x61, 0x97, 0xcc, 0x23, 0xe2, 0x87, 0x2e, 0xf5, 0xc3, 0x03, 0x32, 0x8f, 0xd8, 0x9f,
-	0x7e, 0x15, 0xd0, 0x88, 0x6a, 0x7b, 0x0e, 0xe5, 0x0b, 0xf1, 0xf1, 0x42, 0xcf, 0x4e, 0x64, 0xab,
-	0x5e, 0x4f, 0xfa, 0xde, 0xd4, 0x0a, 0x09, 0xff, 0x27, 0x4e, 0xed, 0xed, 0x15, 0x99, 0x81, 0x25,
-	0xfe, 0x8b, 0xa3, 0xfd, 0x3e, 0xdc, 0x1a, 0x93, 0x30, 0xb4, 0x1c, 0xa2, 0x69, 0xb0, 0x61, 0x5b,
-	0x91, 0xd5, 0x05, 0x08, 0xe0, 0x6d, 0x93, 0xaf, 0x7b, 0x75, 0x08, 0xc6, 0xfd, 0x57, 0xe1, 0xce,
-	0x51, 0xca, 0x78, 0x2b, 0xa0, 0xf1, 0x95, 0x76, 0x07, 0xee, 0x66, 0xd4, 0x89, 0xc3, 0xb6, 0xba,
-	0x73, 0x04, 0xf0, 0x2d, 0x73, 0x87, 0x14, 0x4e, 0xec, 0xff, 0x57, 0x83, 0x6d, 0xfe, 0x5d, 0xdb,
-	0xf5, 0x9d, 0x24, 0x50, 0x6f, 0x0f, 0xf6, 0xca, 0x7b, 0x27, 0xf1, 0x74, 0x26, 0x56, 0x03, 0x92,
-	0xa8, 0xc0, 0x8e, 0x4e, 0x92, 0xcd, 0x49, 0x18, 0x05, 0xae, 0xef, 0x68, 0xfb, 0xfa, 0xb5, 0x32,
-	0xf0, 0x2b, 0x3e, 0xb4, 0x42, 0x92, 0x10, 0xbb, 0xff, 0x00, 0x9e, 0xd1, 0x6d, 0x52, 0x0e, 0xc5,
-	0x51, 0x83, 0xc7, 0x00, 0xee, 0xad, 0x88, 0x93, 0xe5, 0xa1, 0x14, 0xeb, 0x5f, 0x16, 0xeb, 0xe9,
-	0xc1, 0x3d, 0x7d, 0x5d, 0x95, 0xf4, 0xf2, 0x45, 0xeb, 0xd7, 0xab, 0x60, 0xf6, 0xc8, 0xb5, 0xc7,
-	0xfa, 0x06, 0x6c, 0x99, 0xe4, 0x8a, 0x58, 0x11, 0xb1, 0x45, 0x39, 0x5e, 0x84, 0xed, 0x20, 0xd9,
-	0x98, 0xcc, 0x93, 0x7a, 0xfc, 0x55, 0x43, 0x75, 0x56, 0x90, 0xf4, 0xc0, 0xb9, 0x28, 0xc8, 0x6d,
-	0x08, 0x45, 0x54, 0x6b, 0xea, 0x91, 0xfd, 0x66, 0x13, 0xb4, 0x17, 0x8b, 0xc5, 0xa2, 0xd6, 0xff,
-	0x1b, 0xc0, 0xe7, 0xd3, 0x48, 0x24, 0x3a, 0x73, 0x03, 0x72, 0x4c, 0x83, 0x99, 0x15, 0x65, 0x85,
-	0x1f, 0x7c, 0x01, 0x60, 0x27, 0x93, 0x89, 0x44, 0x93, 0x4b, 0x97, 0x78, 0xb6, 0x66, 0x3c, 0x41,
-	0xa5, 0x55, 0xcc, 0x54, 0x35, 0x9b, 0x8b, 0xf6, 0xda, 0x7a, 0xd1, 0xd6, 0x26, 0x65, 0xee, 0xce,
-	0xb2, 0xc3, 0xc7, 0x2c, 0x9f, 0xfd, 0x36, 0x6c, 0x1c, 0xf9, 0xf1, 0x4c, 0x6b, 0xc2, 0xc6, 0x83,
-	0x23, 0xf3, 0xed, 0xf6, 0x53, 0xc6, 0x3b, 0x30, 0x6f, 0xca, 0xc9, 0x94, 0x52, 0x4f, 0xa9, 0xb2,
-	0x04, 0x01, 0xdc, 0x34, 0x5b, 0xd9, 0x19, 0x87, 0x94, 0x7a, 0x46, 0x2c, 0x23, 0x09, 0x0b, 0xa7,
-	0x82, 0xbc, 0x44, 0x00, 0xef, 0x0c, 0xfa, 0x4f, 0xe8, 0x15, 0x3f, 0x9e, 0x49, 0x61, 0xd9, 0x47,
-	0xe3, 0x44, 0xfe, 0xd5, 0xb9, 0x7e, 0xf4, 0xca, 0x40, 0x29, 0xae, 0x83, 0x00, 0xbe, 0x21, 0xfd,
-	0x42, 0xef, 0x31, 0x82, 0x71, 0x0a, 0xdb, 0x39, 0x34, 0x54, 0xa7, 0xbe, 0x8f, 0x00, 0xee, 0x98,
-	0x79, 0x62, 0x27, 0xee, 0x32, 0x36, 0x56, 0xc7, 0xba, 0x08, 0xe0, 0x96, 0x84, 0x3d, 0x15, 0xd8,
-	0xb2, 0x04, 0xa3, 0xa1, 0x12, 0xf5, 0x03, 0x04, 0x70, 0xbd, 0x28, 0xc1, 0x68, 0xb8, 0x2c, 0x81,
-	0x22, 0xf5, 0x43, 0x04, 0xb0, 0x56, 0x92, 0xa0, 0x8c, 0x8d, 0xd5, 0xb1, 0x1e, 0x02, 0xb8, 0x51,
-	0x92, 0x60, 0x34, 0x34, 0xee, 0x43, 0x4d, 0xca, 0xf6, 0xd2, 0x9d, 0x13, 0x5b, 0x51, 0xdb, 0x19,
-	0x02, 0x78, 0xd7, 0xec, 0xe4, 0xf9, 0x26, 0x10, 0xe3, 0x0c, 0xe6, 0x9b, 0x93, 0x2a, 0x64, 0x1f,
-	0x01, 0xbc, 0x65, 0xe6, 0x97, 0x7d, 0x9c, 0x80, 0x0b, 0x65, 0xbb, 0xf4, 0xa8, 0x15, 0x29, 0x61,
-	0x29, 0x02, 0xb8, 0x26, 0x95, 0xed, 0x98, 0x11, 0x56, 0x09, 0xa1, 0xa8, 0xf0, 0x15, 0x02, 0xb8,
-	0xbd, 0x24, 0xc4, 0x68, 0xb8, 0x42, 0x08, 0x45, 0xf2, 0x47, 0x08, 0xe0, 0x9b, 0x65, 0x21, 0xca,
-	0x3d, 0x61, 0xd3, 0x78, 0xea, 0xa9, 0x19, 0x4d, 0x80, 0x00, 0x06, 0x52, 0x4f, 0xbc, 0xc9, 0x11,
-	0xa5, 0x0e, 0x56, 0xf7, 0xca, 0x90, 0x5b, 0xa5, 0xd4, 0xc1, 0x1c, 0x51, 0x2c, 0xdb, 0xf4, 0x93,
-	0x88, 0x84, 0x4a, 0xd4, 0x88, 0x0f, 0x12, 0x79, 0xd9, 0x0e, 0x19, 0xc1, 0x78, 0x24, 0x6b, 0x3b,
-	0xae, 0x60, 0xb6, 0x31, 0xb7, 0x8d, 0x17, 0x36, 0xb2, 0x0d, 0xa9, 0x04, 0xc9, 0x8e, 0xf1, 0x19,
-	0x90, 0xfb, 0x26, 0xd9, 0x1d, 0x2b, 0x65, 0xf0, 0x31, 0xcf, 0xe0, 0xce, 0x46, 0x19, 0xe8, 0x63,
-	0xa9, 0xc1, 0xd2, 0x68, 0xc6, 0x02, 0x48, 0x16, 0xc2, 0x0d, 0x5b, 0x29, 0x81, 0x87, 0x08, 0x60,
-	0x38, 0x78, 0x79, 0x83, 0x71, 0x23, 0x1b, 0xc5, 0xcc, 0x52, 0x3c, 0xe3, 0x53, 0xd8, 0xe2, 0x83,
-	0xe0, 0xa4, 0xca, 0xc0, 0x73, 0x8b, 0x2b, 0xb0, 0x3e, 0x81, 0xc0, 0x62, 0x29, 0x04, 0x56, 0x5a,
-	0x8a, 0x6d, 0x22, 0x7d, 0x62, 0xbd, 0x25, 0xcd, 0x2c, 0xca, 0xbe, 0xfc, 0x25, 0x1b, 0x6f, 0x9a,
-	0x66, 0x2b, 0x1b, 0x6f, 0xb8, 0x31, 0x3f, 0x2c, 0x40, 0x95, 0x9d, 0xf9, 0x2b, 0x06, 0xdd, 0xd0,
-	0x9a, 0xb3, 0xc0, 0xdc, 0x9a, 0x4f, 0x0b, 0x13, 0x98, 0xba, 0xdd, 0x7d, 0xcd, 0x22, 0xdf, 0x90,
-	0xa6, 0x35, 0x61, 0xce, 0x67, 0xb0, 0x23, 0x61, 0x2b, 0xb8, 0xf3, 0x37, 0x8c, 0xdb, 0x31, 0x33,
-	0x55, 0xce, 0x13, 0x7b, 0x2e, 0x82, 0x2b, 0xf8, 0xf3, 0xb7, 0x0c, 0xdc, 0x92, 0xc0, 0xa7, 0x99,
-	0xef, 0x17, 0x85, 0x50, 0xbc, 0x71, 0x7e, 0xc7, 0xb8, 0xf5, 0xa2, 0x10, 0xe2, 0x86, 0x5c, 0x12,
-	0x42, 0x91, 0xfb, 0x3d, 0xe3, 0x6a, 0x25, 0x21, 0x96, 0xc0, 0x15, 0x5c, 0xfa, 0x07, 0x06, 0x6e,
-	0x94, 0x84, 0x18, 0x0d, 0x8d, 0x77, 0xe1, 0x33, 0x72, 0xc6, 0x55, 0xdc, 0xf4, 0x47, 0x86, 0xde,
-	0x35, 0x3b, 0x79, 0xce, 0xa9, 0x51, 0xdf, 0x87, 0x9a, 0x04, 0xaf, 0xc2, 0xfe, 0x89, 0xb1, 0xb7,
-	0xcc, 0xac, 0x58, 0xe7, 0xa9, 0x55, 0x17, 0x0b, 0xa8, 0xee, 0xd5, 0x3f, 0x33, 0x70, 0x4d, 0x2a,
-	0xa0, 0x30, 0xeb, 0x55, 0x72, 0x28, 0x2a, 0xfd, 0x98, 0x91, 0xdb, 0x4b, 0x72, 0x88, 0x91, 0xa8,
-	0x2c, 0x87, 0x22, 0xfb, 0x17, 0xc6, 0xbe, 0x59, 0x96, 0x63, 0xa9, 0x3f, 0x2a, 0x38, 0xf6, 0xaf,
-	0x8c, 0x0c, 0xa4, 0xfe, 0x48, 0x2c, 0xbb, 0xd4, 0xd1, 0xea, 0x9e, 0xfd, 0x9b, 0x78, 0xc0, 0x93,
-	0x3a, 0x5a, 0x98, 0x76, 0xb1, 0x80, 0xea, 0xae, 0xfd, 0x3b, 0xe3, 0x6e, 0x4b, 0x05, 0x14, 0xb6,
-	0xbd, 0x00, 0x05, 0x91, 0xab, 0x18, 0xf7, 0x1f, 0x8c, 0xbc, 0xb9, 0x73, 0x67, 0x09, 0xa4, 0x96,
-	0xf1, 0x08, 0x66, 0x77, 0x5d, 0x75, 0xcb, 0xfc, 0x93, 0x05, 0x87, 0x83, 0x97, 0xd6, 0x07, 0x2f,
-	0x3c, 0x57, 0x9b, 0xc5, 0x70, 0x4c, 0x02, 0x31, 0x4e, 0xf0, 0x87, 0xe7, 0xe4, 0x01, 0x58, 0x25,
-	0x87, 0xcf, 0xeb, 0xdc, 0x36, 0xf1, 0x26, 0xaf, 0x09, 0x58, 0x88, 0x64, 0x22, 0xe3, 0x6b, 0xfe,
-	0x78, 0x6b, 0xbc, 0x07, 0x9f, 0x93, 0x32, 0x10, 0x5d, 0x93, 0x24, 0xb2, 0x31, 0xb5, 0x2b, 0x5e,
-	0x8c, 0x3c, 0x9b, 0x83, 0x44, 0xe7, 0xf0, 0x08, 0x87, 0x6f, 0x3c, 0x78, 0xdd, 0xa1, 0xd4, 0xf1,
-	0x88, 0xee, 0x50, 0xcf, 0xf2, 0x1d, 0x9d, 0x06, 0xce, 0x01, 0x27, 0x1e, 0x5c, 0xcc, 0x6c, 0xb1,
-	0xba, 0xb8, 0xeb, 0x10, 0xff, 0xae, 0x43, 0x0f, 0x22, 0x12, 0x46, 0xb6, 0x15, 0xf1, 0x57, 0x4a,
-	0xd2, 0x3b, 0xa6, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xa5, 0xa0, 0x8e, 0xb5, 0xc8, 0x12, 0x00,
-	0x00,
+	// 1111 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x98, 0xcb, 0x6e, 0xdb, 0x46,
+	0x14, 0x86, 0x3b, 0x92, 0x12, 0x2b, 0x53, 0xcb, 0x96, 0x18, 0x24, 0x15, 0x04, 0x17, 0x18, 0x08,
+	0x28, 0x32, 0x75, 0x1b, 0x09, 0x60, 0x05, 0x01, 0x65, 0x77, 0x46, 0xed, 0xc0, 0x0b, 0xa1, 0x28,
+	0x0d, 0xc3, 0x4e, 0xba, 0x60, 0x29, 0x73, 0xc4, 0xb0, 0x95, 0x48, 0x97, 0x97, 0x44, 0x5d, 0x34,
+	0x10, 0xfa, 0x04, 0x7d, 0x8f, 0xa2, 0xf7, 0x5b, 0x7a, 0xdf, 0xb6, 0x8b, 0x6e, 0xfa, 0x44, 0xc1,
+	0xcc, 0xf0, 0x32, 0xa4, 0x64, 0x59, 0xc3, 0x85, 0x04, 0x72, 0x48, 0x7d, 0xe7, 0xf0, 0x3f, 0x47,
+	0xfc, 0x0f, 0x09, 0xdb, 0x64, 0x1e, 0x12, 0x37, 0x70, 0x3c, 0x37, 0xe8, 0x93, 0x79, 0x48, 0x3f,
+	0xbd, 0x4b, 0xdf, 0x0b, 0x3d, 0x65, 0xcf, 0xf6, 0xd8, 0x06, 0xdf, 0xbd, 0xe8, 0xa5, 0x27, 0xd2,
+	0xad, 0x4e, 0x47, 0xf8, 0xdd, 0xd8, 0x0c, 0x08, 0xfb, 0xe2, 0xa7, 0x76, 0xf6, 0xf2, 0x4c, 0xdf,
+	0xe4, 0xdf, 0xfc, 0x68, 0xb7, 0x0b, 0xb7, 0x46, 0x24, 0x08, 0x4c, 0x9b, 0x28, 0x0a, 0xac, 0x59,
+	0x66, 0x68, 0xb6, 0x01, 0x02, 0x78, 0x5b, 0x67, 0xdb, 0x9d, 0x2a, 0x04, 0xa3, 0xee, 0xdb, 0x70,
+	0xe7, 0x30, 0x61, 0x3c, 0xf0, 0xbd, 0xe8, 0x52, 0xb9, 0x07, 0x77, 0x53, 0xaa, 0x61, 0xd3, 0xa5,
+	0xf6, 0x1c, 0x01, 0x7c, 0x4b, 0xdf, 0x21, 0xb9, 0x13, 0xbb, 0xff, 0x57, 0x60, 0x93, 0xfd, 0xd6,
+	0x72, 0x5c, 0x3b, 0x0e, 0xd4, 0xd9, 0x83, 0x9d, 0xe2, 0xda, 0x49, 0x34, 0x9e, 0xf1, 0x2d, 0x95,
+	0xc4, 0x2a, 0xd0, 0xa3, 0x46, 0xbc, 0x68, 0x04, 0xa1, 0xef, 0xb8, 0xb6, 0xb2, 0xdf, 0xbb, 0x52,
+	0x06, 0x76, 0xc5, 0x07, 0x66, 0x40, 0x62, 0x62, 0xfb, 0x1f, 0xc0, 0x32, 0xba, 0x4b, 0x8a, 0xa1,
+	0x18, 0x4a, 0x7d, 0x0e, 0xe0, 0xde, 0x8a, 0x38, 0x69, 0x1e, 0x52, 0xb1, 0xfe, 0xa5, 0xb1, 0x5e,
+	0x56, 0x8f, 0x7b, 0xeb, 0xaa, 0xd4, 0x2b, 0x5e, 0x74, 0xef, 0x6a, 0x15, 0xf4, 0x0e, 0xb9, 0xf2,
+	0x58, 0x57, 0x83, 0x0d, 0x9d, 0x5c, 0x12, 0x33, 0x24, 0x16, 0x2f, 0xc7, 0xeb, 0xb0, 0xe9, 0xc7,
+	0x0b, 0xc6, 0x3c, 0xae, 0xc7, 0xdf, 0x15, 0x54, 0xa5, 0x05, 0x49, 0x0e, 0x9c, 0xf3, 0x82, 0xdc,
+	0x85, 0x90, 0x47, 0x35, 0xc7, 0x53, 0xb2, 0x5f, 0xaf, 0x83, 0xe6, 0x62, 0xb1, 0x58, 0x54, 0xba,
+	0xff, 0x01, 0xf8, 0x6a, 0x12, 0x89, 0x84, 0x67, 0x8e, 0x4f, 0x8e, 0x3c, 0x7f, 0x66, 0x86, 0x69,
+	0xe1, 0xd5, 0x2f, 0x01, 0xbc, 0x93, 0xca, 0x44, 0x42, 0x23, 0xbd, 0x36, 0x45, 0xbb, 0x46, 0xa9,
+	0x55, 0xdc, 0x44, 0x39, 0x8b, 0x09, 0xf7, 0xce, 0x7a, 0xe1, 0xd6, 0x26, 0xa6, 0xdf, 0x9e, 0xa5,
+	0x87, 0xd3, 0xc5, 0xfd, 0x26, 0xac, 0x1d, 0xba, 0xd1, 0x4c, 0xa9, 0xc3, 0xda, 0xa3, 0x43, 0xfd,
+	0xbd, 0xe6, 0x4b, 0xda, 0xfb, 0x30, 0x6b, 0x4e, 0x63, 0xec, 0x79, 0x53, 0xa9, 0x0a, 0x13, 0x04,
+	0x70, 0x5d, 0x6f, 0xa4, 0x67, 0x1c, 0x78, 0xde, 0x54, 0x8b, 0x44, 0x24, 0xa1, 0xe1, 0x64, 0x90,
+	0x13, 0x04, 0xf0, 0x8e, 0xda, 0xbd, 0xa6, 0x67, 0xdc, 0x68, 0x26, 0x84, 0xa5, 0xbb, 0xda, 0x89,
+	0xf8, 0xef, 0x73, 0xdc, 0xf0, 0x2d, 0x55, 0x2a, 0xae, 0x8d, 0x00, 0xbe, 0x21, 0xfc, 0x53, 0x8f,
+	0x29, 0x41, 0x3b, 0x85, 0xcd, 0x0c, 0x1a, 0xc8, 0x53, 0x1f, 0x23, 0x80, 0x5b, 0x7a, 0x96, 0xd8,
+	0x89, 0xb3, 0x8c, 0x8d, 0xe4, 0xb1, 0x0e, 0x02, 0xb8, 0x21, 0x60, 0x4f, 0x39, 0xb6, 0x28, 0xc1,
+	0x70, 0x20, 0x45, 0xfd, 0x08, 0x01, 0x5c, 0xcd, 0x4b, 0x30, 0x1c, 0x2c, 0x4b, 0x20, 0x49, 0xfd,
+	0x18, 0x01, 0xac, 0x14, 0x24, 0x28, 0x62, 0x23, 0x79, 0xec, 0x14, 0x01, 0x5c, 0x2b, 0x48, 0x30,
+	0x1c, 0x68, 0x0f, 0xa1, 0x22, 0x64, 0x3b, 0x71, 0xe6, 0xc4, 0x92, 0xd4, 0x76, 0x86, 0x00, 0xde,
+	0xd5, 0x5b, 0x59, 0xbe, 0x31, 0x44, 0x3b, 0x83, 0xd9, 0xa2, 0x51, 0x86, 0xec, 0x22, 0x80, 0xb7,
+	0xf4, 0xec, 0xb2, 0x8f, 0x62, 0x70, 0xae, 0x6c, 0x93, 0xa9, 0x67, 0x86, 0x52, 0x58, 0x0f, 0x01,
+	0x5c, 0x11, 0xca, 0x76, 0x44, 0x09, 0xab, 0x84, 0x90, 0x54, 0xf8, 0x12, 0x01, 0xdc, 0x5c, 0x12,
+	0x62, 0x38, 0x58, 0x21, 0x84, 0x24, 0xf9, 0x13, 0x04, 0xf0, 0xcd, 0xa2, 0x10, 0xc5, 0x9e, 0xb0,
+	0xbc, 0x68, 0x3c, 0x95, 0x33, 0x1c, 0x1f, 0x01, 0x0c, 0x84, 0x9e, 0x78, 0x97, 0x21, 0x0a, 0x1d,
+	0x2c, 0xef, 0x99, 0x01, 0xb3, 0x4c, 0xa1, 0x83, 0x19, 0x22, 0x5f, 0xb6, 0xf1, 0xa7, 0x21, 0x09,
+	0xa4, 0xa8, 0x21, 0x1b, 0x28, 0xb2, 0xb2, 0x1d, 0x50, 0x82, 0xf6, 0x4c, 0xd4, 0x76, 0x54, 0xc2,
+	0x74, 0x23, 0x66, 0x1d, 0xaf, 0x6d, 0x64, 0x1d, 0x42, 0x09, 0xe2, 0x15, 0xed, 0x73, 0x20, 0xf6,
+	0x4d, 0xbc, 0x3a, 0x92, 0xca, 0xe0, 0x09, 0xcb, 0xe0, 0xde, 0x46, 0x19, 0xf4, 0x46, 0x42, 0x83,
+	0x25, 0xd1, 0xb4, 0x05, 0x10, 0x2c, 0x84, 0x19, 0xb7, 0x54, 0x02, 0x4f, 0x11, 0xc0, 0x50, 0x7d,
+	0x73, 0x83, 0xb1, 0x23, 0x1d, 0xc9, 0xf4, 0x42, 0x3c, 0xed, 0x33, 0xd8, 0x60, 0x03, 0xa1, 0x51,
+	0x66, 0xf0, 0xb9, 0xc5, 0x14, 0x58, 0x9f, 0x80, 0x6f, 0xd2, 0x14, 0x7c, 0x33, 0x29, 0xc5, 0x36,
+	0x11, 0xf6, 0x68, 0x6f, 0x09, 0xb3, 0x8b, 0xb4, 0x2f, 0x7f, 0x45, 0xc7, 0x9c, 0xba, 0xde, 0x48,
+	0xc7, 0x1c, 0x66, 0xcc, 0x4f, 0x73, 0x50, 0x69, 0x67, 0xfe, 0x9a, 0x42, 0x37, 0xb4, 0xe6, 0x34,
+	0x30, 0xb3, 0xe6, 0xd3, 0xdc, 0x24, 0x26, 0x6f, 0x77, 0xdf, 0xd0, 0xc8, 0x37, 0x84, 0xa9, 0x8d,
+	0x9b, 0xf3, 0x19, 0x6c, 0x09, 0xd8, 0x12, 0xee, 0xfc, 0x2d, 0xe5, 0xb6, 0xf4, 0x54, 0x95, 0xf3,
+	0xd8, 0x9e, 0xf3, 0xe0, 0x12, 0xfe, 0xfc, 0x1d, 0x05, 0x37, 0x04, 0xf0, 0x69, 0xea, 0xfb, 0x79,
+	0x21, 0x24, 0x6f, 0x9c, 0xdf, 0x53, 0x6e, 0x35, 0x2f, 0x04, 0xbf, 0x21, 0x17, 0x84, 0x90, 0xe4,
+	0xfe, 0x40, 0xb9, 0x4a, 0x41, 0x88, 0x25, 0x70, 0x09, 0x97, 0xfe, 0x91, 0x82, 0x6b, 0x05, 0x21,
+	0x86, 0x03, 0xed, 0x03, 0x78, 0x5b, 0xcc, 0xb8, 0x8c, 0x9b, 0xfe, 0x44, 0xd1, 0xbb, 0x7a, 0x2b,
+	0xcb, 0x39, 0x31, 0xea, 0x87, 0x50, 0x11, 0xe0, 0x65, 0xd8, 0x3f, 0x53, 0xf6, 0x96, 0x9e, 0x16,
+	0xeb, 0x3c, 0xb1, 0xea, 0x7c, 0x01, 0xe5, 0xbd, 0xfa, 0x17, 0x0a, 0xae, 0x08, 0x05, 0xe4, 0x66,
+	0xbd, 0x4a, 0x0e, 0x49, 0xa5, 0x9f, 0x53, 0x72, 0x73, 0x49, 0x0e, 0x3e, 0x12, 0x15, 0xe5, 0x90,
+	0x64, 0xff, 0x4a, 0xd9, 0x37, 0x8b, 0x72, 0x2c, 0xf5, 0x47, 0x09, 0xc7, 0xfe, 0x8d, 0x92, 0x81,
+	0xd0, 0x1f, 0xb1, 0x65, 0x17, 0x3a, 0x5a, 0xde, 0xb3, 0x7f, 0xe7, 0x0f, 0x7a, 0x42, 0x47, 0x73,
+	0xd3, 0xce, 0x17, 0x50, 0xde, 0xb5, 0xff, 0xa0, 0xdc, 0x6d, 0xa1, 0x80, 0xdc, 0xb6, 0x17, 0x20,
+	0x27, 0x72, 0x19, 0xe3, 0xfe, 0x93, 0x92, 0x37, 0x77, 0xee, 0x34, 0x81, 0xc4, 0x32, 0x9e, 0xc1,
+	0xf4, 0xae, 0x2b, 0x6f, 0x99, 0x7f, 0xd1, 0xe0, 0x50, 0x7d, 0x63, 0x7d, 0xf0, 0xdc, 0xf3, 0xb5,
+	0x9e, 0x0f, 0x47, 0x25, 0xe0, 0xe3, 0x04, 0x7b, 0x88, 0x36, 0x26, 0x0e, 0x99, 0x5a, 0x52, 0x39,
+	0x7c, 0x51, 0x65, 0xb6, 0x89, 0x37, 0x79, 0x5d, 0x40, 0x43, 0xc4, 0x13, 0x19, 0xdb, 0x3e, 0xa2,
+	0xd1, 0xb4, 0x0f, 0xe1, 0x2b, 0x42, 0x06, 0xbc, 0x6b, 0xe2, 0x44, 0x36, 0xa6, 0xb6, 0xf9, 0x0b,
+	0x92, 0x3b, 0x19, 0x88, 0x77, 0x0e, 0x8b, 0x70, 0x70, 0xfc, 0xe8, 0x81, 0xed, 0x84, 0x8f, 0xa3,
+	0x71, 0xef, 0xc2, 0x9b, 0xf5, 0x6d, 0x6f, 0x6a, 0xba, 0x76, 0x9f, 0x11, 0xc7, 0xd1, 0xa4, 0xff,
+	0x44, 0xed, 0x5f, 0xcc, 0x2c, 0xbe, 0x7f, 0x71, 0xdf, 0x26, 0xee, 0x7d, 0xdb, 0xeb, 0x87, 0x24,
+	0x08, 0x2d, 0x33, 0x64, 0x2f, 0x98, 0x84, 0x37, 0x4e, 0x2f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xc4,
+	0xeb, 0x05, 0x33, 0xd6, 0x12, 0x00, 0x00,
 }
diff --git a/cmd/protoc-gen-go/testdata/extensions/ext/ext.proto b/cmd/protoc-gen-go/testdata/extensions/ext/ext.proto
index 5fb9e94..0bb263a 100644
--- a/cmd/protoc-gen-go/testdata/extensions/ext/ext.proto
+++ b/cmd/protoc-gen-go/testdata/extensions/ext/ext.proto
@@ -98,6 +98,6 @@
 // Message set wire format.
 message MessageSetWireFormatExtension {
   extend goproto.protoc.extension.base.MessageSetWireFormatMessage {
-    optional MessageSetWireFormatExtension message_set_field = 100;
+    optional MessageSetWireFormatExtension message_set_extension = 100;
   }
 }
diff --git a/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go b/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go
index baf4a3d..043edce 100644
--- a/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go
+++ b/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go
@@ -66,14 +66,15 @@
 func init() { proto.RegisterFile("extensions/extra/extra.proto", fileDescriptor_496c2a5e9c1e8739) }
 
 var fileDescriptor_496c2a5e9c1e8739 = []byte{
-	// 143 bytes of a gzipped FileDescriptorProto
+	// 149 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x49, 0xad, 0x28, 0x49,
 	0xcd, 0x2b, 0xce, 0xcc, 0xcf, 0x2b, 0xd6, 0x4f, 0xad, 0x28, 0x29, 0x4a, 0x84, 0x90, 0x7a, 0x05,
 	0x45, 0xf9, 0x25, 0xf9, 0x42, 0x72, 0xe9, 0xf9, 0x60, 0x06, 0x84, 0x9b, 0xac, 0x07, 0x57, 0xac,
 	0x07, 0x56, 0xa5, 0xa4, 0xc4, 0xc5, 0xe3, 0x0a, 0x62, 0xf8, 0xa6, 0x16, 0x17, 0x27, 0xa6, 0xa7,
 	0x0a, 0x09, 0x71, 0xb1, 0xa4, 0x24, 0x96, 0x24, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0xf0, 0x04, 0x81,
-	0xd9, 0x4e, 0xae, 0x51, 0xce, 0xe9, 0xf9, 0xf9, 0xe9, 0x39, 0xa9, 0x7a, 0xe9, 0xf9, 0x39, 0x89,
-	0x79, 0xe9, 0x7a, 0xf9, 0x45, 0xe9, 0xfa, 0x60, 0xf3, 0xf4, 0x93, 0x73, 0x53, 0x20, 0xac, 0x64,
-	0xdd, 0xf4, 0xd4, 0x3c, 0xdd, 0xf4, 0x7c, 0xfd, 0x92, 0xd4, 0xe2, 0x12, 0x90, 0x2e, 0x7d, 0x74,
-	0x67, 0x01, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa9, 0xe3, 0x2f, 0xd9, 0xa9, 0x00, 0x00, 0x00,
+	0xd9, 0x4e, 0xde, 0x51, 0x9e, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa,
+	0xe9, 0xf9, 0x39, 0x89, 0x79, 0xe9, 0xfa, 0x60, 0xf3, 0x92, 0x4a, 0xd3, 0xf4, 0xcb, 0x8c, 0xf4,
+	0x93, 0x73, 0x53, 0x20, 0xfc, 0x64, 0xdd, 0xf4, 0xd4, 0x3c, 0xdd, 0xf4, 0x7c, 0xfd, 0x92, 0xd4,
+	0xe2, 0x12, 0x90, 0x5e, 0x7d, 0x74, 0xc7, 0x01, 0x02, 0x00, 0x00, 0xff, 0xff, 0xcb, 0xfb, 0x31,
+	0xfc, 0xaf, 0x00, 0x00, 0x00,
 }
diff --git a/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go b/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go
index 47678b2..283dba4 100644
--- a/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go
+++ b/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go
@@ -381,8 +381,8 @@
 }
 
 func init() {
-	proto.RegisterType((*Message)(nil), "goproto.protoc.extension.proto3.Message")
 	proto.RegisterEnum("goproto.protoc.extension.proto3.Enum", Enum_name, Enum_value)
+	proto.RegisterType((*Message)(nil), "goproto.protoc.extension.proto3.Message")
 	proto.RegisterExtension(E_ExtensionBool)
 	proto.RegisterExtension(E_ExtensionEnum)
 	proto.RegisterExtension(E_ExtensionInt32)
@@ -422,52 +422,53 @@
 func init() { proto.RegisterFile("extensions/proto3/ext3.proto", fileDescriptor_3db31bb248c8865e) }
 
 var fileDescriptor_3db31bb248c8865e = []byte{
-	// 748 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x97, 0xdb, 0x4b, 0xdc, 0x50,
-	0x10, 0xc6, 0xbb, 0xba, 0xba, 0x7a, 0xaa, 0xee, 0x1a, 0x68, 0xbd, 0xb4, 0xa0, 0x14, 0x0a, 0x52,
-	0x30, 0x01, 0x37, 0xe4, 0x21, 0x8f, 0xa2, 0x16, 0x29, 0x22, 0xa4, 0x14, 0x8a, 0x94, 0xda, 0xec,
-	0xe6, 0x18, 0x02, 0x31, 0x67, 0x49, 0xce, 0x52, 0xfb, 0xd4, 0xd7, 0xfe, 0x7b, 0xbd, 0xdf, 0x6f,
-	0x8f, 0xbd, 0xdf, 0x6f, 0x6f, 0x65, 0xf6, 0x64, 0x4d, 0x36, 0x39, 0x31, 0xe3, 0x93, 0x49, 0xcc,
-	0xfc, 0x66, 0xe6, 0x9b, 0xb3, 0xdf, 0x10, 0x72, 0x96, 0x1e, 0x70, 0x1a, 0x44, 0x1e, 0x0b, 0x22,
-	0xad, 0x13, 0x32, 0xce, 0x9a, 0x1a, 0x3d, 0xe0, 0x4d, 0xb5, 0x77, 0xad, 0x2c, 0xb8, 0xac, 0x77,
-	0x21, 0x6e, 0xdb, 0xea, 0xe1, 0xcb, 0xe2, 0x41, 0x73, 0x7e, 0xd1, 0x65, 0xcc, 0xf5, 0xa9, 0x08,
-	0x6d, 0x75, 0xf7, 0x34, 0x87, 0x46, 0xed, 0xd0, 0xeb, 0x70, 0x16, 0x8a, 0x57, 0xce, 0x8d, 0x93,
-	0xda, 0x16, 0x8d, 0x22, 0xdb, 0xa5, 0x17, 0x1a, 0xa4, 0xba, 0x1e, 0x74, 0xf7, 0x95, 0x31, 0x52,
-	0xdd, 0x59, 0xb7, 0xb6, 0x1b, 0x27, 0xcc, 0x8b, 0x64, 0xea, 0x10, 0xb9, 0xdb, 0x62, 0xcc, 0x57,
-	0x16, 0x54, 0x41, 0x54, 0xfb, 0x44, 0x35, 0x8e, 0xde, 0xee, 0x70, 0x28, 0x72, 0xf6, 0x5d, 0x6d,
-	0xb1, 0xb2, 0x34, 0x66, 0x4d, 0x1e, 0xc6, 0xad, 0x32, 0xe6, 0x9b, 0x41, 0x1a, 0x44, 0x21, 0x49,
-	0x29, 0xe8, 0x3d, 0x80, 0xa6, 0x56, 0xce, 0xab, 0x25, 0x3d, 0xaa, 0x50, 0x73, 0x2a, 0x1f, 0xdc,
-	0x9a, 0x9b, 0xa4, 0x9e, 0xe4, 0xf3, 0x02, 0xde, 0x5c, 0x29, 0x4f, 0xf8, 0x01, 0x12, 0x8e, 0x58,
-	0x49, 0xa1, 0x9b, 0x10, 0x67, 0x5e, 0x22, 0x8d, 0x04, 0x15, 0x21, 0x59, 0x1f, 0x81, 0x35, 0x6d,
-	0x25, 0x45, 0x5c, 0xf6, 0xf2, 0xb0, 0x2e, 0x12, 0xf6, 0x09, 0x60, 0x93, 0x29, 0xd8, 0x15, 0x01,
-	0xcb, 0x36, 0x69, 0xe8, 0xe5, 0xac, 0xcf, 0xc0, 0x1a, 0x1e, 0x6c, 0xd2, 0xd0, 0xf3, 0x4d, 0x62,
-	0x58, 0x5f, 0x80, 0xa5, 0x64, 0x9a, 0xcc, 0xc2, 0xba, 0x48, 0xd8, 0x57, 0x80, 0x55, 0x33, 0x4d,
-	0x1a, 0xba, 0xb9, 0x4d, 0x94, 0x54, 0x65, 0x7b, 0xde, 0x01, 0x75, 0x30, 0x9a, 0x7d, 0x03, 0x5c,
-	0xdd, 0x9a, 0x4e, 0x6a, 0x8b, 0x43, 0xcd, 0x2d, 0x92, 0x3c, 0xdc, 0x45, 0xf3, 0xbe, 0x03, 0xaf,
-	0x66, 0x25, 0x8d, 0x6d, 0xc4, 0xb8, 0x81, 0x21, 0xec, 0xf9, 0xcc, 0xe6, 0xe5, 0xb0, 0x1f, 0x00,
-	0x1b, 0x4a, 0x0d, 0x61, 0x03, 0xe2, 0x64, 0xad, 0x62, 0x94, 0xfb, 0x09, 0xb4, 0x46, 0xae, 0x55,
-	0x43, 0x97, 0xb4, 0x8a, 0xe1, 0xfd, 0x02, 0xde, 0x68, 0xb6, 0xd5, 0xec, 0x5c, 0x1d, 0xd6, 0x6d,
-	0xf9, 0xb4, 0x9c, 0xf6, 0x1b, 0x68, 0x95, 0xd4, 0x5c, 0xd7, 0x7a, 0x81, 0x99, 0x13, 0xc7, 0x43,
-	0x2f, 0x70, 0xcb, 0x61, 0x7f, 0x00, 0x36, 0x9e, 0x3e, 0x71, 0xbd, 0xc0, 0xc1, 0x21, 0xb4, 0x6e,
-	0x71, 0x1a, 0x95, 0xb3, 0xfe, 0x02, 0x6b, 0x22, 0x35, 0x84, 0x55, 0x88, 0x33, 0x6f, 0xa6, 0x35,
-	0x8b, 0x43, 0xca, 0x61, 0xff, 0x00, 0x76, 0x72, 0x65, 0xa9, 0xd4, 0xac, 0xe2, 0xb8, 0x94, 0xba,
-	0xf1, 0x13, 0xf3, 0x2a, 0x99, 0x09, 0x69, 0x87, 0xda, 0x9c, 0x3a, 0xbb, 0xc7, 0x35, 0xdd, 0xbb,
-	0xf5, 0xc5, 0xe1, 0xa5, 0x31, 0xeb, 0x54, 0x1f, 0xb0, 0x3e, 0x60, 0xbe, 0xb7, 0xa5, 0x64, 0x9c,
-	0x0b, 0xdf, 0x03, 0x32, 0xda, 0x85, 0xf3, 0x05, 0xf4, 0xdc, 0x78, 0x87, 0xcc, 0x4a, 0x0a, 0x40,
-	0xba, 0xdf, 0x7d, 0xa8, 0x60, 0xc4, 0x3a, 0x9d, 0x43, 0x0b, 0x7b, 0xbe, 0x46, 0xe6, 0x24, 0x6c,
-	0xac, 0x4f, 0x3f, 0x00, 0xf8, 0xb4, 0x35, 0x93, 0x83, 0xc7, 0x7e, 0x2d, 0xa7, 0x63, 0x8d, 0xfb,
-	0x21, 0xd0, 0x27, 0x25, 0xf4, 0xd8, 0xc0, 0x0b, 0x75, 0xc1, 0xfc, 0x4c, 0x1f, 0x01, 0x7c, 0x58,
-	0xae, 0x8b, 0xa1, 0x1f, 0xa1, 0x0b, 0x06, 0xfe, 0x18, 0xe0, 0x4a, 0x81, 0x2e, 0x85, 0x74, 0xac,
-	0xd7, 0x3f, 0x01, 0x7a, 0xb5, 0x40, 0x17, 0x43, 0x37, 0x6f, 0x90, 0x33, 0xb2, 0xda, 0xd1, 0x66,
-	0xfd, 0x14, 0xf8, 0x75, 0x6b, 0x2e, 0x5f, 0x7d, 0x7f, 0x09, 0x5c, 0x27, 0xf3, 0x92, 0x0c, 0xe8,
-	0x04, 0xcf, 0x20, 0x41, 0xcd, 0x9a, 0xcd, 0x25, 0xe8, 0x6f, 0x05, 0xf9, 0x64, 0x91, 0xeb, 0xe1,
-	0x39, 0xd0, 0x87, 0x24, 0x93, 0x15, 0x6b, 0xe2, 0x28, 0x75, 0x30, 0xea, 0xbf, 0x00, 0x7c, 0xa3,
-	0x50, 0x1d, 0x43, 0x3f, 0x4a, 0x1d, 0x4c, 0x82, 0x97, 0x90, 0x60, 0xb4, 0x48, 0x9d, 0xc2, 0xd3,
-	0x83, 0xdd, 0x28, 0xaf, 0x00, 0x5f, 0x91, 0x9c, 0x9e, 0x78, 0xb3, 0x14, 0x9c, 0x7c, 0xe4, 0x8a,
-	0x79, 0x0d, 0xf4, 0x71, 0xd9, 0xc9, 0x17, 0xab, 0x46, 0x3e, 0x59, 0xe4, 0xce, 0x79, 0x03, 0xf0,
-	0x09, 0xc9, 0x64, 0xc5, 0xee, 0xb9, 0x53, 0x91, 0x0a, 0x8f, 0xde, 0x42, 0x6f, 0x01, 0x7f, 0x9c,
-	0x2d, 0x94, 0x1f, 0x51, 0xfc, 0x9f, 0xd5, 0x8d, 0x9d, 0xb5, 0x38, 0x99, 0xcb, 0x7c, 0x3b, 0x70,
-	0x55, 0x16, 0xba, 0xe2, 0x2b, 0x42, 0x6b, 0xef, 0x3b, 0xe2, 0xaa, 0xbd, 0xec, 0xd2, 0x60, 0xd9,
-	0x65, 0x1a, 0xa7, 0x11, 0x77, 0x6c, 0x6e, 0x6b, 0xb9, 0x8f, 0x95, 0xd6, 0xa8, 0xf8, 0xfb, 0x3f,
-	0x00, 0x00, 0xff, 0xff, 0x82, 0x55, 0xdb, 0x72, 0xc8, 0x0c, 0x00, 0x00,
+	// 758 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x97, 0xdb, 0x4b, 0xdc, 0x5e,
+	0x10, 0xc7, 0x7f, 0xab, 0xab, 0xab, 0xe7, 0xa7, 0xee, 0xba, 0xd0, 0x7a, 0x69, 0x41, 0x29, 0x14,
+	0xa4, 0x60, 0x02, 0xbb, 0x21, 0x0f, 0x79, 0x94, 0x6a, 0xb1, 0xad, 0x08, 0x29, 0x85, 0x22, 0xa5,
+	0x76, 0xb3, 0x39, 0xa6, 0x81, 0x98, 0xb3, 0x6c, 0x4e, 0x5a, 0xfb, 0xd4, 0xd7, 0xfe, 0x7b, 0xbd,
+	0xdf, 0x6f, 0x8f, 0xbd, 0xdf, 0x6f, 0x6f, 0x65, 0xf6, 0x64, 0x4d, 0x36, 0x39, 0x31, 0xe3, 0x93,
+	0x49, 0xcc, 0x7c, 0x66, 0xe6, 0x3b, 0x67, 0xbf, 0x43, 0xc8, 0x71, 0xba, 0xc7, 0xa9, 0x1f, 0xb8,
+	0xcc, 0x0f, 0xd4, 0x4e, 0x97, 0x71, 0xd6, 0x54, 0xe9, 0x1e, 0x6f, 0x2a, 0xbd, 0xeb, 0xfa, 0x82,
+	0xc3, 0x7a, 0x17, 0xe2, 0xb6, 0xad, 0xec, 0xbf, 0x2c, 0x1e, 0x34, 0xe7, 0x17, 0x1d, 0xc6, 0x1c,
+	0x8f, 0x8a, 0x50, 0x2b, 0xdc, 0x51, 0x6d, 0x1a, 0xb4, 0xbb, 0x6e, 0x87, 0xb3, 0xae, 0x78, 0xe5,
+	0xc4, 0x38, 0xa9, 0x6c, 0xd0, 0x20, 0x68, 0x39, 0xf4, 0x54, 0x8d, 0x94, 0x57, 0xfd, 0x70, 0xb7,
+	0x3e, 0x46, 0xca, 0x5b, 0xab, 0xe6, 0x66, 0xed, 0x3f, 0xe3, 0x0c, 0x99, 0xda, 0x47, 0x6e, 0x5b,
+	0x8c, 0x79, 0xf5, 0x05, 0x45, 0x10, 0x95, 0x3e, 0x51, 0x89, 0xa2, 0x37, 0x3b, 0x1c, 0x8a, 0x9c,
+	0x7d, 0x5b, 0x59, 0x2c, 0x2d, 0x8d, 0x99, 0x93, 0xfb, 0x71, 0x2b, 0x8c, 0x79, 0x86, 0x9f, 0x04,
+	0x51, 0x48, 0x52, 0x08, 0x7a, 0x07, 0xa0, 0xa9, 0xc6, 0x49, 0xa5, 0xa0, 0x47, 0x05, 0x6a, 0x4e,
+	0xe4, 0x83, 0x5b, 0x63, 0x9d, 0x54, 0xe3, 0x7c, 0xae, 0xcf, 0x9b, 0x8d, 0xe2, 0x84, 0xef, 0x21,
+	0xe1, 0x88, 0x19, 0x17, 0xba, 0x0e, 0x71, 0xc6, 0x39, 0x52, 0x8b, 0x51, 0x01, 0x92, 0xf5, 0x01,
+	0x58, 0xd3, 0x66, 0x5c, 0xc4, 0x05, 0x37, 0x0b, 0x0b, 0x91, 0xb0, 0x8f, 0x00, 0x9b, 0x4c, 0xc0,
+	0x2e, 0x0a, 0x58, 0xba, 0x49, 0x5d, 0x2b, 0x66, 0x7d, 0x02, 0xd6, 0xf0, 0x60, 0x93, 0xba, 0x96,
+	0x6d, 0x12, 0xc3, 0xfa, 0x0c, 0xac, 0x7a, 0xaa, 0xc9, 0x34, 0x2c, 0x44, 0xc2, 0xbe, 0x00, 0xac,
+	0x9c, 0x6a, 0x52, 0xd7, 0x8c, 0x4d, 0x52, 0x4f, 0x54, 0xb6, 0xe3, 0xee, 0x51, 0x1b, 0xa3, 0xd9,
+	0x57, 0xc0, 0x55, 0xcd, 0xe9, 0xb8, 0xb6, 0x28, 0xd4, 0xd8, 0x20, 0xf1, 0xc3, 0x6d, 0x34, 0xef,
+	0x1b, 0xf0, 0x2a, 0x66, 0xdc, 0xd8, 0x5a, 0x84, 0x1b, 0x18, 0xc2, 0x8e, 0xc7, 0x5a, 0xbc, 0x18,
+	0xf6, 0x1d, 0x60, 0x43, 0x89, 0x21, 0xac, 0x41, 0x9c, 0xac, 0x55, 0x8c, 0x72, 0x3f, 0x80, 0x56,
+	0xcb, 0xb4, 0xaa, 0x6b, 0x92, 0x56, 0x31, 0xbc, 0x9f, 0xc0, 0x1b, 0x4d, 0xb7, 0x9a, 0x9e, 0xab,
+	0xcd, 0x42, 0xcb, 0xa3, 0xc5, 0xb4, 0x5f, 0x40, 0x2b, 0x25, 0xe6, 0x7a, 0xba, 0x17, 0x98, 0x3a,
+	0x71, 0xbc, 0xeb, 0xfa, 0x4e, 0x31, 0xec, 0x37, 0xc0, 0xc6, 0x93, 0x27, 0xae, 0x17, 0x38, 0x38,
+	0x04, 0xeb, 0x26, 0xa7, 0x41, 0x31, 0xeb, 0x0f, 0xb0, 0x26, 0x12, 0x43, 0x58, 0x81, 0x38, 0xe3,
+	0x46, 0x52, 0xb3, 0x28, 0xa4, 0x18, 0xf6, 0x17, 0x60, 0xff, 0x37, 0x96, 0x0a, 0xcd, 0x2a, 0x8a,
+	0x4b, 0xa8, 0x1b, 0x3d, 0x31, 0x2e, 0x91, 0x99, 0x2e, 0xed, 0xd0, 0x16, 0xa7, 0xf6, 0xf6, 0x61,
+	0x4d, 0xf7, 0x4e, 0x75, 0x71, 0x78, 0x69, 0xcc, 0x3c, 0xd2, 0x07, 0xac, 0x0e, 0x98, 0xef, 0x2d,
+	0x29, 0x19, 0xe7, 0xc2, 0x77, 0x81, 0x8c, 0x76, 0xe1, 0x6c, 0x01, 0x3d, 0x37, 0xde, 0x22, 0xb3,
+	0x92, 0x02, 0x90, 0xee, 0x77, 0x0f, 0x2a, 0x18, 0x31, 0x8f, 0x66, 0xd0, 0xc2, 0x9e, 0x2f, 0x93,
+	0x39, 0x09, 0x1b, 0xeb, 0xd3, 0xf7, 0x01, 0x3e, 0x6d, 0xce, 0x64, 0xe0, 0x91, 0x5f, 0xcb, 0xe9,
+	0x58, 0xe3, 0x7e, 0x00, 0xf4, 0x49, 0x09, 0x3d, 0x32, 0xf0, 0x5c, 0x5d, 0x30, 0x3f, 0xd3, 0x87,
+	0x00, 0x1f, 0x96, 0xeb, 0xa2, 0x6b, 0x07, 0xe8, 0x82, 0x81, 0x3f, 0x02, 0x78, 0x3d, 0x47, 0x97,
+	0x5c, 0x3a, 0xd6, 0xeb, 0x1f, 0x03, 0xbd, 0x9c, 0xa3, 0x8b, 0xae, 0x19, 0x57, 0xc9, 0x31, 0x59,
+	0xed, 0x68, 0xb3, 0x7e, 0x02, 0xfc, 0xaa, 0x39, 0x97, 0xad, 0xbe, 0xbf, 0x04, 0xae, 0x90, 0x79,
+	0x49, 0x06, 0x74, 0x82, 0xa7, 0x90, 0xa0, 0x62, 0xce, 0x66, 0x12, 0xf4, 0xb7, 0x82, 0x7c, 0xb2,
+	0xc8, 0xf5, 0xf0, 0x0c, 0xe8, 0x43, 0x92, 0xc9, 0x8a, 0x35, 0x71, 0x90, 0x3a, 0x18, 0xf5, 0x9f,
+	0x03, 0xbe, 0x96, 0xab, 0x8e, 0xae, 0x1d, 0xa4, 0x0e, 0x26, 0xc1, 0x0b, 0x48, 0x30, 0x9a, 0xa7,
+	0x4e, 0xee, 0xe9, 0xc1, 0x6e, 0x94, 0x97, 0x80, 0x2f, 0x49, 0x4e, 0x4f, 0xb4, 0x59, 0x72, 0x4e,
+	0x3e, 0x72, 0xc5, 0xbc, 0x02, 0xfa, 0xb8, 0xec, 0xe4, 0x8b, 0x55, 0x23, 0x9f, 0x2c, 0x72, 0xe7,
+	0xbc, 0x06, 0xf8, 0x84, 0x64, 0xb2, 0x62, 0xf7, 0xdc, 0x2e, 0x49, 0x85, 0x47, 0x6f, 0xa1, 0x37,
+	0x80, 0x3f, 0xcc, 0x16, 0xca, 0x8e, 0x28, 0xfa, 0xcf, 0xca, 0xf9, 0xad, 0xb3, 0x8e, 0xcb, 0xaf,
+	0x85, 0x96, 0xd2, 0x66, 0xbb, 0xaa, 0xc3, 0xbc, 0x96, 0xef, 0xc4, 0x5f, 0x11, 0xd7, 0x1b, 0x6a,
+	0x7b, 0xd7, 0x16, 0xf7, 0xed, 0x65, 0x87, 0xfa, 0xcb, 0x0e, 0x53, 0x39, 0x0d, 0xb8, 0xdd, 0xe2,
+	0x2d, 0x35, 0xf3, 0xc9, 0x62, 0x8d, 0x8a, 0xbf, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x65, 0x92,
+	0xaa, 0xed, 0xce, 0x0c, 0x00, 0x00,
 }
diff --git a/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go b/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go
index 6e6e84c..eb97be1 100644
--- a/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go
+++ b/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go
@@ -432,31 +432,32 @@
 func init() { proto.RegisterFile("fieldnames/fieldnames.proto", fileDescriptor_6bbe3f70febb9403) }
 
 var fileDescriptor_6bbe3f70febb9403 = []byte{
-	// 411 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x93, 0x4b, 0x8b, 0x13, 0x41,
-	0x10, 0xc7, 0xcd, 0xba, 0xb2, 0x49, 0x65, 0xd7, 0x47, 0x13, 0x63, 0xef, 0xc3, 0x28, 0x7a, 0xc9,
-	0xc1, 0x4d, 0x40, 0xc1, 0x93, 0x22, 0x26, 0xb0, 0x78, 0x71, 0x03, 0xc3, 0x9e, 0xbc, 0x34, 0x6d,
-	0x4f, 0x4d, 0x6f, 0x60, 0xa6, 0x6b, 0xe9, 0xe9, 0xe0, 0x57, 0xf3, 0xe3, 0xc9, 0x54, 0xcf, 0x23,
-	0xc4, 0xb9, 0x55, 0xfd, 0xfe, 0x8f, 0x50, 0xd3, 0x04, 0x2e, 0xb3, 0x2d, 0xe6, 0xa9, 0xd3, 0x05,
-	0x96, 0xcb, 0x6e, 0x5c, 0x3c, 0x78, 0x0a, 0x24, 0xce, 0x2d, 0xf1, 0x10, 0x57, 0xb3, 0xe8, 0x0c,
-	0xef, 0xfe, 0x3e, 0x81, 0x93, 0x9f, 0x58, 0x96, 0xda, 0xa2, 0xb8, 0x84, 0x11, 0x2b, 0x8a, 0x1c,
-	0xca, 0xc1, 0xdb, 0xc1, 0x7c, 0x94, 0x0c, 0x19, 0x6c, 0x1c, 0x8a, 0x0b, 0x18, 0xde, 0x54, 0xf3,
-	0xdd, 0x1f, 0x92, 0x47, 0x51, 0x6b, 0x76, 0x31, 0x03, 0x60, 0xdf, 0xdd, 0xbd, 0x47, 0x94, 0x8f,
-	0x59, 0xdd, 0x23, 0x62, 0x06, 0xe3, 0x58, 0xac, 0x32, 0xda, 0x79, 0x79, 0xcc, 0x86, 0xf8, 0x5b,
-	0x37, 0xb4, 0xf3, 0x55, 0x3e, 0xc5, 0xd2, 0xf8, 0xed, 0x43, 0x20, 0x2f, 0x21, 0xe6, 0x3b, 0x22,
-	0x24, 0x9c, 0x14, 0xda, 0x97, 0xf7, 0x3a, 0x97, 0x63, 0x16, 0x9b, 0x55, 0x5c, 0xc1, 0x68, 0xe7,
-	0x1a, 0xed, 0x34, 0xf6, 0xb6, 0x40, 0xbc, 0x87, 0x33, 0xbe, 0x58, 0x15, 0xf1, 0x42, 0x79, 0xc6,
-	0x8e, 0x53, 0x86, 0xcd, 0xd5, 0x57, 0x30, 0x5a, 0xeb, 0x02, 0xf3, 0xb5, 0x2e, 0x51, 0x4e, 0x62,
-	0x45, 0x0b, 0xc4, 0x6b, 0x80, 0x76, 0x51, 0xf2, 0x65, 0x8f, 0x6c, 0xaa, 0x45, 0x99, 0x2a, 0x3d,
-	0x8d, 0xb2, 0x69, 0xe5, 0x19, 0x8c, 0xbb, 0xb4, 0x92, 0xaf, 0x0e, 0xe3, 0xe7, 0x30, 0xb4, 0x18,
-	0x54, 0xf5, 0x14, 0x72, 0x16, 0x2f, 0xb3, 0x18, 0x6e, 0x75, 0x81, 0x42, 0xc0, 0x31, 0xe3, 0x37,
-	0x8c, 0x79, 0x16, 0x73, 0x78, 0xba, 0x71, 0x48, 0xd9, 0x9a, 0x5c, 0x96, 0x6f, 0x4d, 0xf8, 0x2e,
-	0xe7, 0x95, 0xfa, 0xe3, 0x51, 0x72, 0xc0, 0xc5, 0x07, 0x78, 0x41, 0x15, 0x51, 0x8e, 0x94, 0xa9,
-	0xa9, 0xfc, 0xc8, 0xe6, 0x41, 0xf2, 0x8c, 0xa5, 0x5b, 0x6a, 0xec, 0xff, 0xf5, 0xae, 0xe4, 0xa7,
-	0xda, 0x7a, 0xc0, 0xc5, 0x67, 0x98, 0xc6, 0xde, 0xfa, 0x8b, 0x76, 0xe5, 0x5f, 0x38, 0x71, 0x94,
-	0x4c, 0x58, 0xaf, 0x3f, 0x6e, 0x13, 0xbc, 0x98, 0xc2, 0x64, 0xd3, 0xc3, 0x57, 0x02, 0x9e, 0xc7,
-	0xbe, 0xa6, 0x47, 0xe9, 0x1e, 0xf6, 0xbb, 0x87, 0x99, 0xd5, 0xb7, 0x5f, 0x5f, 0x2d, 0x91, 0xcd,
-	0x71, 0x61, 0x29, 0xd7, 0xce, 0x2e, 0xc8, 0xdb, 0x25, 0x3f, 0xed, 0xd2, 0x14, 0x69, 0x9c, 0xcc,
-	0xb5, 0x45, 0x77, 0x6d, 0x69, 0x19, 0xb0, 0x0c, 0xa9, 0x0e, 0x7a, 0xef, 0xcf, 0xf1, 0x2f, 0x00,
-	0x00, 0xff, 0xff, 0xe0, 0x4d, 0xd2, 0x82, 0x34, 0x03, 0x00, 0x00,
+	// 417 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x93, 0x4b, 0x6f, 0xd3, 0x40,
+	0x10, 0xc7, 0x49, 0x29, 0x6a, 0x32, 0x69, 0x79, 0xac, 0x42, 0xd8, 0x3e, 0x08, 0x08, 0x2e, 0x39,
+	0xd0, 0x58, 0x2a, 0x12, 0x27, 0x2e, 0x24, 0xa2, 0xe2, 0x42, 0x23, 0x45, 0x3d, 0x71, 0x59, 0x6d,
+	0x36, 0xe3, 0x8d, 0x25, 0x7b, 0xa7, 0xb2, 0xd7, 0xf0, 0xd5, 0xf8, 0x78, 0xc8, 0xb3, 0x7e, 0x54,
+	0xc1, 0xb7, 0x99, 0xdf, 0xff, 0x11, 0x8d, 0x57, 0x81, 0xcb, 0x38, 0xc1, 0x74, 0xe7, 0x74, 0x86,
+	0x45, 0xd4, 0x8d, 0x8b, 0x87, 0x9c, 0x3c, 0x89, 0x73, 0x4b, 0x3c, 0x84, 0xd5, 0x2c, 0x3a, 0xc3,
+	0x87, 0xbf, 0xcf, 0xe0, 0xe4, 0x27, 0x16, 0x85, 0xb6, 0x28, 0x2e, 0x61, 0xc4, 0x8a, 0x22, 0x87,
+	0x72, 0xf0, 0x7e, 0x30, 0x1f, 0x6d, 0x86, 0x0c, 0xd6, 0x0e, 0xc5, 0x05, 0x0c, 0x6f, 0xab, 0xf9,
+	0xfe, 0x0f, 0xc9, 0xa3, 0xa0, 0x35, 0xbb, 0x98, 0x01, 0xb0, 0xef, 0x7e, 0x9f, 0x23, 0xca, 0xa7,
+	0xac, 0x3e, 0x22, 0x62, 0x06, 0xe3, 0x50, 0xac, 0x62, 0x2a, 0x73, 0x79, 0xcc, 0x86, 0xf0, 0x5b,
+	0xb7, 0x54, 0xe6, 0x55, 0x7e, 0x87, 0x85, 0xc9, 0x93, 0x07, 0x4f, 0xb9, 0x84, 0x90, 0xef, 0x88,
+	0x90, 0x70, 0x92, 0xe9, 0xbc, 0xd8, 0xeb, 0x54, 0x8e, 0x59, 0x6c, 0x56, 0x71, 0x05, 0xa3, 0xd2,
+	0x35, 0xda, 0x69, 0xe8, 0x6d, 0x81, 0xf8, 0x08, 0x67, 0x7c, 0xb1, 0xca, 0xc2, 0x85, 0xf2, 0x8c,
+	0x1d, 0xa7, 0x0c, 0x9b, 0xab, 0xaf, 0x60, 0xb4, 0xd2, 0x19, 0xa6, 0x2b, 0x5d, 0xa0, 0x9c, 0x84,
+	0x8a, 0x16, 0x88, 0xb7, 0x00, 0xed, 0xa2, 0xe4, 0xeb, 0x1e, 0xd9, 0x54, 0x8b, 0x32, 0x55, 0x7a,
+	0x1a, 0x64, 0xd3, 0xca, 0x33, 0x18, 0x77, 0x69, 0x25, 0xdf, 0x1c, 0xc6, 0xcf, 0x61, 0x68, 0xd1,
+	0xab, 0xea, 0x29, 0xe4, 0x2c, 0x5c, 0x66, 0xd1, 0xdf, 0xe9, 0x0c, 0x85, 0x80, 0x63, 0xc6, 0xef,
+	0x18, 0xf3, 0x2c, 0xe6, 0xf0, 0x7c, 0xed, 0x90, 0xe2, 0x15, 0xb9, 0x38, 0x4d, 0x8c, 0xff, 0x26,
+	0xe7, 0x95, 0xfa, 0xe3, 0xc9, 0xe6, 0x80, 0x8b, 0x4f, 0xf0, 0x8a, 0x2a, 0xa2, 0x1c, 0x29, 0x53,
+	0x53, 0x79, 0xc3, 0xe6, 0xc1, 0xe6, 0x05, 0x4b, 0x77, 0xd4, 0xd8, 0xff, 0xeb, 0x5d, 0xca, 0xcf,
+	0xb5, 0xf5, 0x80, 0x8b, 0x2f, 0x30, 0x0d, 0xbd, 0xf5, 0x17, 0xed, 0xca, 0xbf, 0x72, 0xe2, 0x68,
+	0x33, 0x61, 0xbd, 0xfe, 0xb8, 0x4d, 0xf0, 0x62, 0x0a, 0x93, 0x75, 0x0f, 0x5f, 0x0a, 0x78, 0x19,
+	0xfa, 0x9a, 0x1e, 0xa5, 0x7b, 0xd8, 0xb6, 0x87, 0x99, 0xe5, 0xf7, 0x5f, 0x2b, 0x9b, 0xf8, 0x7d,
+	0xb9, 0x5d, 0x18, 0xca, 0x22, 0x4b, 0xa9, 0x76, 0x36, 0xe2, 0xa7, 0xdd, 0x96, 0x71, 0xf4, 0xfb,
+	0x26, 0x32, 0xd9, 0x2e, 0xec, 0xe6, 0xda, 0xa2, 0xbb, 0xb6, 0x14, 0x79, 0x2c, 0xfc, 0x4e, 0x7b,
+	0xfd, 0xe8, 0x2f, 0xf2, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xbd, 0xee, 0x38, 0xe6, 0x3a, 0x03, 0x00,
+	0x00,
 }
diff --git a/cmd/protoc-gen-go/testdata/import_public/a.pb.go b/cmd/protoc-gen-go/testdata/import_public/a.pb.go
index bf39bf4..75b719d 100644
--- a/cmd/protoc-gen-go/testdata/import_public/a.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/a.pb.go
@@ -117,7 +117,7 @@
 func init() { proto.RegisterFile("import_public/a.proto", fileDescriptor_73b7577c95fa6b70) }
 
 var fileDescriptor_73b7577c95fa6b70 = []byte{
-	// 201 bytes of a gzipped FileDescriptorProto
+	// 207 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcd, 0xcc, 0x2d, 0xc8,
 	0x2f, 0x2a, 0x89, 0x2f, 0x28, 0x4d, 0xca, 0xc9, 0x4c, 0xd6, 0x4f, 0xd4, 0x2b, 0x28, 0xca, 0x2f,
 	0xc9, 0x17, 0x92, 0x49, 0xcf, 0x07, 0x33, 0x20, 0xdc, 0x64, 0x3d, 0x14, 0x55, 0x52, 0x92, 0xa8,
@@ -126,9 +126,9 @@
 	0x29, 0xeb, 0xe1, 0xb3, 0x46, 0xaf, 0xb8, 0x34, 0x49, 0xcf, 0x37, 0x88, 0x31, 0x17, 0xa4, 0x25,
 	0x55, 0x82, 0x49, 0x81, 0x51, 0x83, 0x8f, 0x18, 0x2d, 0xae, 0x41, 0x8c, 0xa9, 0x42, 0x96, 0x5c,
 	0xac, 0x39, 0xf9, 0xc9, 0x89, 0x39, 0x12, 0xcc, 0xc4, 0xd8, 0xe4, 0x03, 0x52, 0x1a, 0x04, 0xd1,
-	0xe1, 0xe4, 0x14, 0xe5, 0x90, 0x9e, 0x9f, 0x9f, 0x9e, 0x93, 0xaa, 0x97, 0x9e, 0x9f, 0x93, 0x98,
-	0x97, 0xae, 0x97, 0x5f, 0x94, 0xae, 0x0f, 0xd6, 0xa6, 0x9f, 0x9c, 0x9b, 0x02, 0x61, 0x25, 0xeb,
-	0xa6, 0xa7, 0xe6, 0xe9, 0xa6, 0xe7, 0xeb, 0x97, 0xa4, 0x16, 0x97, 0xa4, 0x24, 0x96, 0x24, 0xea,
-	0xa3, 0x18, 0x18, 0xc0, 0x10, 0xc0, 0x98, 0xc4, 0x06, 0x56, 0x69, 0x0c, 0x08, 0x00, 0x00, 0xff,
-	0xff, 0x12, 0x1b, 0x7e, 0x64, 0x63, 0x01, 0x00, 0x00,
+	0xe1, 0xe4, 0x11, 0xe5, 0x96, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x9f,
+	0x9e, 0x9f, 0x93, 0x98, 0x97, 0xae, 0x0f, 0xd6, 0x96, 0x54, 0x9a, 0xa6, 0x5f, 0x66, 0xa4, 0x9f,
+	0x9c, 0x9b, 0x02, 0xe1, 0x27, 0xeb, 0xa6, 0xa7, 0xe6, 0xe9, 0xa6, 0xe7, 0xeb, 0x97, 0xa4, 0x16,
+	0x97, 0xa4, 0x24, 0x96, 0x24, 0xea, 0xa3, 0x18, 0x1b, 0xc0, 0x10, 0xc0, 0x98, 0xc4, 0x06, 0x56,
+	0x69, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x70, 0xe1, 0xdc, 0x69, 0x01, 0x00, 0x00,
 }
diff --git a/cmd/protoc-gen-go/testdata/import_public/b.pb.go b/cmd/protoc-gen-go/testdata/import_public/b.pb.go
index 5d244a3..0afec4b 100644
--- a/cmd/protoc-gen-go/testdata/import_public/b.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/b.pb.go
@@ -75,16 +75,17 @@
 func init() { proto.RegisterFile("import_public/b.proto", fileDescriptor_84995586b3d09710) }
 
 var fileDescriptor_84995586b3d09710 = []byte{
-	// 174 bytes of a gzipped FileDescriptorProto
+	// 180 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x8c, 0x31, 0x0b, 0xc2, 0x30,
-	0x10, 0x46, 0x39, 0x41, 0x87, 0x0a, 0x0e, 0x05, 0xa1, 0x8a, 0x43, 0xd1, 0xa5, 0x4b, 0xef, 0x50,
-	0xff, 0x80, 0x14, 0xdc, 0x74, 0xe9, 0xe8, 0x22, 0x49, 0x1a, 0x8e, 0x42, 0xd2, 0x2b, 0x6d, 0xfa,
-	0xff, 0xc5, 0x76, 0xea, 0x22, 0x6e, 0xdf, 0x07, 0xef, 0xbd, 0x68, 0x5b, 0xfb, 0x56, 0xba, 0xf0,
-	0x6e, 0x07, 0xed, 0x6a, 0x43, 0x1a, 0xdb, 0x4e, 0x82, 0xc4, 0x07, 0x96, 0x71, 0x4c, 0xd7, 0xe0,
-	0x8c, 0xda, 0xef, 0xe6, 0x52, 0x3f, 0x68, 0x52, 0x13, 0x79, 0xf4, 0xd1, 0xf2, 0x21, 0x46, 0xb9,
-	0xf8, 0x1c, 0x81, 0x4f, 0x20, 0x85, 0x6c, 0x7d, 0x39, 0xe1, 0xaf, 0x1a, 0xf6, 0x83, 0xc6, 0x67,
-	0x09, 0xfe, 0xab, 0xd8, 0x64, 0x91, 0x42, 0xb6, 0xf9, 0x47, 0xb9, 0x97, 0x60, 0x8b, 0xe2, 0x75,
-	0x63, 0x11, 0x76, 0x16, 0x59, 0x9c, 0x6a, 0x18, 0xa5, 0x63, 0x1a, 0x15, 0x32, 0xbe, 0x9a, 0x96,
-	0xc9, 0xd9, 0x36, 0x39, 0x0b, 0x05, 0xdb, 0x87, 0x4a, 0x05, 0x45, 0xb3, 0x98, 0x5e, 0x8d, 0xd4,
-	0xf5, 0x13, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x8b, 0x86, 0xd2, 0x0b, 0x01, 0x00, 0x00,
+	0x10, 0x46, 0x89, 0xa0, 0x43, 0x05, 0x87, 0x82, 0x50, 0xc5, 0xa1, 0xe8, 0xd2, 0xa5, 0x39, 0xac,
+	0xff, 0x40, 0x50, 0x1c, 0x74, 0xe9, 0xe8, 0x22, 0xb9, 0x34, 0xc6, 0x42, 0xd3, 0x2b, 0xed, 0xc5,
+	0xdf, 0x2f, 0xb6, 0x53, 0x17, 0x71, 0xfb, 0x3e, 0x78, 0xef, 0x05, 0xcb, 0xd2, 0x35, 0xd4, 0xf2,
+	0xa3, 0xf1, 0x58, 0x95, 0x1a, 0x50, 0x36, 0x2d, 0x31, 0x85, 0x1b, 0x4b, 0xfd, 0x18, 0xae, 0x96,
+	0x23, 0x6a, 0xbd, 0x1a, 0x4b, 0x9d, 0x47, 0x50, 0x03, 0xb9, 0x75, 0xc1, 0xf4, 0x4a, 0x5a, 0x55,
+	0xe1, 0x3e, 0x10, 0x2e, 0x12, 0xb1, 0x48, 0xe6, 0xd9, 0x4e, 0xfe, 0xaa, 0xc9, 0xce, 0xa3, 0xbc,
+	0xe5, 0xc2, 0x7d, 0x15, 0x13, 0x4d, 0x62, 0x91, 0x2c, 0xfe, 0x51, 0x4e, 0xb9, 0x30, 0xc7, 0xcb,
+	0xfd, 0x6c, 0x4b, 0x7e, 0x79, 0x94, 0x9a, 0x1c, 0x58, 0xaa, 0x54, 0x6d, 0xa1, 0x57, 0xd0, 0x3f,
+	0xe1, 0x9d, 0x81, 0x76, 0xc5, 0xf0, 0x75, 0x6a, 0x4d, 0x9d, 0x5a, 0x02, 0x36, 0x1d, 0x17, 0x8a,
+	0x15, 0x8c, 0x92, 0x38, 0xeb, 0xa9, 0xc3, 0x27, 0x00, 0x00, 0xff, 0xff, 0x20, 0x34, 0xa1, 0xfe,
+	0x11, 0x01, 0x00, 0x00,
 }
diff --git a/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go b/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go
index f1d1d78..f1dfd60 100644
--- a/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go
@@ -368,35 +368,35 @@
 }
 
 func init() {
-	proto.RegisterType((*M)(nil), "goproto.protoc.import_public.sub.M")
-	proto.RegisterType((*M_Submessage)(nil), "goproto.protoc.import_public.sub.M.Submessage")
 	proto.RegisterEnum("goproto.protoc.import_public.sub.E", E_name, E_value)
 	proto.RegisterEnum("goproto.protoc.import_public.sub.M_Subenum", M_Subenum_name, M_Subenum_value)
 	proto.RegisterEnum("goproto.protoc.import_public.sub.M_Submessage_Submessage_Subenum", M_Submessage_Submessage_Subenum_name, M_Submessage_Submessage_Subenum_value)
+	proto.RegisterType((*M)(nil), "goproto.protoc.import_public.sub.M")
+	proto.RegisterType((*M_Submessage)(nil), "goproto.protoc.import_public.sub.M.Submessage")
 }
 
 func init() { proto.RegisterFile("import_public/sub/a.proto", fileDescriptor_382f7805394b5c4e) }
 
 var fileDescriptor_382f7805394b5c4e = []byte{
-	// 313 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0x4d, 0x4f, 0xc2, 0x30,
-	0x1c, 0xc6, 0xe9, 0x50, 0x34, 0x7f, 0x42, 0xa2, 0x8d, 0x98, 0xc9, 0x69, 0x12, 0x0f, 0x44, 0x43,
-	0x97, 0x8c, 0x65, 0x77, 0x89, 0xf3, 0xe5, 0xb0, 0x90, 0xb0, 0x78, 0xe1, 0xb2, 0xac, 0xa3, 0x34,
-	0x4b, 0xd6, 0x95, 0xd0, 0xf6, 0x13, 0xfa, 0x71, 0xfc, 0x12, 0xc6, 0x02, 0x02, 0x11, 0xe3, 0xed,
-	0xff, 0xf2, 0x7b, 0x9e, 0xa7, 0x2f, 0x70, 0x53, 0x8a, 0xa5, 0x5c, 0xe9, 0x6c, 0x69, 0x68, 0x55,
-	0x16, 0xbe, 0x32, 0xd4, 0xcf, 0xc9, 0x72, 0x25, 0xb5, 0xc4, 0x1e, 0x97, 0xb6, 0x58, 0xb7, 0x05,
-	0x39, 0x20, 0x89, 0x32, 0xb4, 0x77, 0x44, 0x4c, 0xd7, 0x74, 0xff, 0xd3, 0x01, 0x94, 0xe0, 0x10,
-	0x1c, 0x11, 0xb8, 0xc8, 0x43, 0x83, 0x76, 0x70, 0x47, 0xfe, 0xf3, 0x23, 0x49, 0x30, 0x75, 0x44,
-	0x80, 0x6f, 0xa1, 0x2d, 0x6b, 0x26, 0x17, 0x59, 0x59, 0xeb, 0x51, 0xe0, 0x3a, 0x1e, 0x1a, 0x9c,
-	0xbe, 0x36, 0xa6, 0x60, 0x87, 0x6f, 0xdf, 0xb3, 0x03, 0x24, 0x0a, 0xdd, 0xa6, 0x87, 0x06, 0xcd,
-	0x7d, 0x24, 0x0a, 0x7b, 0x1f, 0x08, 0x20, 0x35, 0x54, 0x30, 0xa5, 0x72, 0xce, 0x70, 0x04, 0xd7,
-	0xea, 0xa7, 0xcb, 0xf6, 0xfd, 0xd1, 0xc6, 0xff, 0x6a, 0xb7, 0x9f, 0xec, 0x92, 0xfe, 0xd0, 0x45,
-	0xa1, 0x3d, 0x57, 0xf3, 0xb8, 0x2e, 0x0a, 0xfb, 0x0f, 0x80, 0x77, 0xe9, 0x59, 0x6a, 0x28, 0xab,
-	0x8d, 0xc0, 0x5d, 0xb8, 0x4c, 0xb2, 0xf4, 0x7d, 0x9c, 0xc4, 0x69, 0xfa, 0xf8, 0x12, 0x67, 0xb3,
-	0x78, 0x3a, 0xb9, 0x68, 0x8c, 0xdd, 0x23, 0x21, 0x8b, 0x92, 0x55, 0xf3, 0x7e, 0x17, 0xce, 0xb6,
-	0x5a, 0x80, 0x56, 0xb2, 0x15, 0x74, 0xb6, 0xf7, 0xb7, 0xd4, 0x7d, 0x07, 0x50, 0x8c, 0xcf, 0xe1,
-	0x64, 0xb3, 0x7d, 0x9e, 0x3d, 0x71, 0x29, 0x79, 0xc5, 0x08, 0x97, 0x55, 0x5e, 0x73, 0x22, 0x57,
-	0xdc, 0xb7, 0xaf, 0xee, 0x17, 0x62, 0xbe, 0xae, 0x8a, 0x21, 0x67, 0xf5, 0x90, 0x4b, 0x5f, 0x33,
-	0xa5, 0xe7, 0xb9, 0xce, 0xfd, 0x5f, 0x9f, 0x49, 0x5b, 0x96, 0x1c, 0x7d, 0x05, 0x00, 0x00, 0xff,
-	0xff, 0xd5, 0x26, 0xfe, 0xc5, 0x25, 0x02, 0x00, 0x00,
+	// 319 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xdf, 0x4e, 0xc2, 0x30,
+	0x18, 0xc5, 0xe9, 0x50, 0x34, 0x1f, 0x21, 0xd1, 0x46, 0xcc, 0xe4, 0x6a, 0x12, 0x2f, 0x88, 0x86,
+	0x35, 0x19, 0xcb, 0xee, 0x25, 0x59, 0xfc, 0x13, 0x17, 0x12, 0x16, 0x6f, 0xb8, 0x59, 0xd6, 0x51,
+	0xea, 0x12, 0xba, 0x12, 0xda, 0xfa, 0x82, 0x3e, 0x8e, 0x2f, 0x61, 0x2c, 0x20, 0x10, 0x31, 0xde,
+	0xed, 0x7c, 0xdf, 0xef, 0x9c, 0xb3, 0xb6, 0x70, 0x55, 0x8a, 0x85, 0x5c, 0xea, 0x6c, 0x61, 0xe8,
+	0xbc, 0x2c, 0x88, 0x32, 0x94, 0xe4, 0xfe, 0x62, 0x29, 0xb5, 0xc4, 0x1e, 0x97, 0xf6, 0x63, 0x25,
+	0x0b, 0x7f, 0x8f, 0xf4, 0x95, 0xa1, 0x9d, 0x03, 0x66, 0xba, 0xa2, 0xbb, 0x9f, 0x0e, 0xa0, 0x04,
+	0x87, 0xe0, 0x88, 0xc0, 0x45, 0x1e, 0xea, 0x35, 0x83, 0x1b, 0xff, 0xbf, 0x3c, 0x3f, 0x09, 0xc6,
+	0x8e, 0x08, 0xf0, 0x35, 0x34, 0x65, 0xc5, 0xe4, 0x2c, 0x2b, 0x2b, 0x3d, 0x08, 0x5c, 0xc7, 0x43,
+	0xbd, 0xe3, 0xc7, 0xda, 0x18, 0xec, 0xf0, 0xe9, 0x7b, 0xb6, 0x87, 0x44, 0xa1, 0x5b, 0xf7, 0x50,
+	0xaf, 0xbe, 0x8b, 0x44, 0x61, 0xe7, 0x03, 0x01, 0xa4, 0x86, 0x0a, 0xa6, 0x54, 0xce, 0x19, 0x8e,
+	0xe0, 0x52, 0xfd, 0xa8, 0x6c, 0x37, 0x1f, 0xad, 0xf3, 0x2f, 0xb6, 0xfb, 0xd1, 0xb6, 0xe9, 0x0f,
+	0x5f, 0x14, 0xda, 0xff, 0xaa, 0x1f, 0xf6, 0x45, 0x61, 0xf7, 0x0e, 0xf0, 0xb6, 0x3d, 0x4b, 0x0d,
+	0x65, 0x95, 0x11, 0xb8, 0x0d, 0xe7, 0x49, 0x96, 0xbe, 0x0e, 0x93, 0x38, 0x4d, 0xef, 0x1f, 0xe2,
+	0x6c, 0x12, 0x8f, 0x47, 0x67, 0xb5, 0xa1, 0x7b, 0xa0, 0x64, 0x56, 0xb2, 0xf9, 0xb4, 0xdb, 0x86,
+	0x93, 0x8d, 0x17, 0xa0, 0x91, 0x6c, 0x0c, 0xad, 0xcd, 0xf9, 0x2d, 0x75, 0xdb, 0x02, 0x14, 0xe3,
+	0x53, 0x38, 0x5a, 0x6f, 0x5f, 0x26, 0xcf, 0xbc, 0xd4, 0x6f, 0x86, 0xfa, 0x85, 0x14, 0x84, 0xcb,
+	0x79, 0x5e, 0x71, 0x62, 0x6f, 0x9d, 0x9a, 0x19, 0x79, 0x0f, 0x48, 0x21, 0xa6, 0x2b, 0x5d, 0xf4,
+	0x39, 0xab, 0xfa, 0x5c, 0x12, 0xcd, 0x94, 0x9e, 0xe6, 0x3a, 0x27, 0xbf, 0x9e, 0x94, 0x36, 0x2c,
+	0x39, 0xf8, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x77, 0x38, 0x44, 0x2b, 0x02, 0x00, 0x00,
 }
diff --git a/cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go b/cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go
index 9c294dd..cf468ff 100644
--- a/cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go
@@ -58,13 +58,14 @@
 func init() { proto.RegisterFile("import_public/sub/b.proto", fileDescriptor_fc66afda3d7c2232) }
 
 var fileDescriptor_fc66afda3d7c2232 = []byte{
-	// 128 bytes of a gzipped FileDescriptorProto
+	// 134 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0xcc, 0x2d, 0xc8,
 	0x2f, 0x2a, 0x89, 0x2f, 0x28, 0x4d, 0xca, 0xc9, 0x4c, 0xd6, 0x2f, 0x2e, 0x4d, 0xd2, 0x4f, 0xd2,
 	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x52, 0x48, 0xcf, 0x07, 0x33, 0x20, 0xdc, 0x64, 0x3d, 0x14,
-	0x95, 0x7a, 0xc5, 0xa5, 0x49, 0x4a, 0x2c, 0x5c, 0x4c, 0xbe, 0x46, 0x4e, 0x6e, 0x51, 0x2e, 0xe9,
-	0xf9, 0xf9, 0xe9, 0x39, 0xa9, 0x7a, 0xe9, 0xf9, 0x39, 0x89, 0x79, 0xe9, 0x7a, 0xf9, 0x45, 0xe9,
-	0xfa, 0x60, 0x3d, 0xfa, 0xc9, 0xb9, 0x29, 0x10, 0x56, 0xb2, 0x6e, 0x7a, 0x6a, 0x9e, 0x6e, 0x7a,
-	0xbe, 0x7e, 0x49, 0x6a, 0x71, 0x49, 0x4a, 0x62, 0x49, 0xa2, 0x3e, 0x86, 0xbd, 0x49, 0x6c, 0x60,
-	0x95, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xca, 0x5a, 0x18, 0x57, 0x93, 0x00, 0x00, 0x00,
+	0x95, 0x7a, 0xc5, 0xa5, 0x49, 0x4a, 0x2c, 0x5c, 0x4c, 0xbe, 0x46, 0x4e, 0x3e, 0x51, 0x5e, 0xe9,
+	0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xe9, 0xf9, 0x39, 0x89, 0x79, 0xe9,
+	0xfa, 0x60, 0x3d, 0x49, 0xa5, 0x69, 0xfa, 0x65, 0x46, 0xfa, 0xc9, 0xb9, 0x29, 0x10, 0x7e, 0xb2,
+	0x6e, 0x7a, 0x6a, 0x9e, 0x6e, 0x7a, 0xbe, 0x7e, 0x49, 0x6a, 0x71, 0x49, 0x4a, 0x62, 0x49, 0xa2,
+	0x3e, 0x86, 0xed, 0x49, 0x6c, 0x60, 0x95, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x46, 0xb8,
+	0x19, 0x87, 0x99, 0x00, 0x00, 0x00,
 }
diff --git a/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go b/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go
index 9043697..174854b 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go
@@ -113,9 +113,9 @@
 }
 
 func init() {
+	proto.RegisterEnum("test.a.E1", E1_name, E1_value)
 	proto.RegisterType((*M1)(nil), "test.a.M1")
 	proto.RegisterType((*M1_1)(nil), "test.a.M1_1")
-	proto.RegisterEnum("test.a.E1", E1_name, E1_value)
 }
 
 func init() { proto.RegisterFile("imports/test_a_1/m1.proto", fileDescriptor_c1091de3fa870a14) }
diff --git a/cmd/protoc-gen-go/testdata/proto2/enum.pb.go b/cmd/protoc-gen-go/testdata/proto2/enum.pb.go
index b592bd0..6e5cf27 100644
--- a/cmd/protoc-gen-go/testdata/proto2/enum.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/enum.pb.go
@@ -322,34 +322,34 @@
 var xxx_messageInfo_EnumContainerMessage1_EnumContainerMessage2 proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*EnumContainerMessage1)(nil), "goproto.protoc.proto2.EnumContainerMessage1")
-	proto.RegisterType((*EnumContainerMessage1_EnumContainerMessage2)(nil), "goproto.protoc.proto2.EnumContainerMessage1.EnumContainerMessage2")
 	proto.RegisterEnum("goproto.protoc.proto2.EnumType1", EnumType1_name, EnumType1_value)
 	proto.RegisterEnum("goproto.protoc.proto2.EnumType2", EnumType2_name, EnumType2_value)
 	proto.RegisterEnum("goproto.protoc.proto2.EnumContainerMessage1_NestedEnumType1A", EnumContainerMessage1_NestedEnumType1A_name, EnumContainerMessage1_NestedEnumType1A_value)
 	proto.RegisterEnum("goproto.protoc.proto2.EnumContainerMessage1_NestedEnumType1B", EnumContainerMessage1_NestedEnumType1B_name, EnumContainerMessage1_NestedEnumType1B_value)
 	proto.RegisterEnum("goproto.protoc.proto2.EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A", EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A_name, EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A_value)
 	proto.RegisterEnum("goproto.protoc.proto2.EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B", EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B_name, EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B_value)
+	proto.RegisterType((*EnumContainerMessage1)(nil), "goproto.protoc.proto2.EnumContainerMessage1")
+	proto.RegisterType((*EnumContainerMessage1_EnumContainerMessage2)(nil), "goproto.protoc.proto2.EnumContainerMessage1.EnumContainerMessage2")
 }
 
 func init() { proto.RegisterFile("proto2/enum.proto", fileDescriptor_de9f68860d540858) }
 
 var fileDescriptor_de9f68860d540858 = []byte{
-	// 242 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xb1, 0x4b, 0xc4, 0x30,
-	0x14, 0xc6, 0xcd, 0x39, 0x88, 0x19, 0x34, 0x56, 0x6e, 0x39, 0x70, 0xb9, 0x45, 0x38, 0xb8, 0x86,
-	0x64, 0x13, 0xa7, 0x56, 0xb3, 0x69, 0x6f, 0xb0, 0x2a, 0xb8, 0x1c, 0xa1, 0x7d, 0x3c, 0x0a, 0x6d,
-	0x5e, 0x69, 0xd3, 0xc1, 0xff, 0xd3, 0x3f, 0x48, 0xae, 0x81, 0xb3, 0x42, 0x75, 0xca, 0xf7, 0xe5,
-	0xfb, 0xf1, 0x1b, 0x1e, 0xbf, 0x6a, 0x3b, 0xf2, 0xa4, 0x25, 0xb8, 0xa1, 0x89, 0xc7, 0x1c, 0x2d,
-	0x91, 0xc6, 0x10, 0x6a, 0x11, 0x1e, 0xbd, 0xfe, 0x62, 0x7c, 0x69, 0xdc, 0xd0, 0x3c, 0x90, 0xf3,
-	0xb6, 0x72, 0xd0, 0x3d, 0x43, 0xdf, 0x5b, 0x04, 0xb5, 0xaa, 0xe6, 0x07, 0xbd, 0xbe, 0xe5, 0x22,
-	0x83, 0xde, 0x43, 0x79, 0x98, 0xf3, 0xcf, 0x16, 0x74, 0x12, 0x5d, 0xf3, 0xcb, 0xcc, 0xbc, 0xe4,
-	0xe6, 0x71, 0xaf, 0x93, 0xfd, 0x5b, 0xf2, 0xf4, 0x6a, 0xc4, 0xc9, 0x0c, 0x98, 0x4e, 0xc1, 0xf4,
-	0x6f, 0x50, 0x4d, 0x8d, 0xea, 0x1f, 0xa3, 0x9a, 0x1a, 0xd5, 0xd1, 0xb8, 0xb9, 0xe1, 0xe7, 0x47,
-	0x24, 0x3a, 0xe3, 0xa7, 0xbb, 0xcc, 0x08, 0x76, 0x08, 0xf9, 0xfb, 0x4e, 0x2c, 0x36, 0xf2, 0x67,
-	0xd6, 0xd1, 0x05, 0xe7, 0xe5, 0xd0, 0xd6, 0x55, 0x61, 0x3d, 0x28, 0xc1, 0x7e, 0x75, 0x2d, 0xd8,
-	0x6a, 0x21, 0x58, 0x7a, 0xff, 0x71, 0x87, 0x44, 0x58, 0x43, 0x8c, 0x54, 0x5b, 0x87, 0x31, 0x75,
-	0x28, 0xc7, 0x13, 0xca, 0xa2, 0x29, 0x43, 0x2a, 0xb6, 0x08, 0x6e, 0x8b, 0x24, 0x3d, 0xf4, 0xbe,
-	0xb4, 0xde, 0x86, 0x6f, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xf6, 0x53, 0xf7, 0xde, 0x8e, 0x01,
-	0x00, 0x00,
+	// 248 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x41, 0x4b, 0xc3, 0x30,
+	0x18, 0x86, 0xcd, 0x3c, 0x88, 0x39, 0x68, 0xac, 0xec, 0x32, 0xf0, 0xb2, 0x8b, 0x30, 0xd8, 0x42,
+	0xbe, 0x3f, 0x20, 0xad, 0xe6, 0xa6, 0xdd, 0xc1, 0xaa, 0xe0, 0x65, 0x64, 0xe9, 0x67, 0x2c, 0xac,
+	0x49, 0x59, 0xbf, 0x08, 0xfe, 0x4f, 0x7f, 0x90, 0xac, 0x85, 0x59, 0x61, 0x7a, 0xca, 0xfb, 0xe6,
+	0x7d, 0x78, 0x0e, 0x1f, 0xbf, 0x68, 0xb6, 0x81, 0x02, 0x48, 0xf4, 0xb1, 0x5e, 0x74, 0x39, 0x19,
+	0xbb, 0xd0, 0x85, 0xbe, 0xda, 0xfe, 0x81, 0xe9, 0x17, 0xe3, 0x63, 0xed, 0x63, 0x7d, 0x1b, 0x3c,
+	0x99, 0xca, 0xe3, 0xf6, 0x01, 0xdb, 0xd6, 0x38, 0x54, 0x93, 0xea, 0xf0, 0x00, 0xd3, 0x6b, 0x2e,
+	0x72, 0x6c, 0x09, 0xcb, 0xdd, 0x5c, 0x7c, 0x36, 0x08, 0x69, 0x72, 0xc9, 0xcf, 0x73, 0xfd, 0x58,
+	0xe8, 0xbb, 0x15, 0xa4, 0xab, 0xe7, 0xf4, 0xfe, 0x49, 0x8b, 0xa3, 0x03, 0x60, 0x36, 0x04, 0xb3,
+	0xbf, 0x41, 0x35, 0x34, 0xaa, 0x7f, 0x8c, 0x6a, 0x68, 0x54, 0x7b, 0xe3, 0xec, 0x8a, 0x9f, 0xee,
+	0x91, 0xe4, 0x84, 0x1f, 0x2f, 0x73, 0x2d, 0xd8, 0x2e, 0x14, 0x2f, 0x4b, 0x31, 0x9a, 0xc9, 0x9f,
+	0x19, 0x92, 0x33, 0xce, 0xcb, 0xd8, 0x6c, 0x2a, 0x6b, 0x08, 0x95, 0x60, 0xbf, 0x3a, 0x08, 0x36,
+	0x19, 0x09, 0x96, 0xa5, 0xaf, 0x37, 0xae, 0xa2, 0xf7, 0xb8, 0x5e, 0xd8, 0x50, 0x4b, 0x17, 0x36,
+	0xc6, 0x3b, 0xd9, 0x9d, 0x70, 0x1d, 0xdf, 0xe4, 0x07, 0x48, 0x5b, 0x97, 0x7d, 0xb7, 0x73, 0x87,
+	0x7e, 0xee, 0x82, 0x24, 0x6c, 0xa9, 0x34, 0x64, 0xfa, 0x6f, 0xf8, 0x0e, 0x00, 0x00, 0xff, 0xff,
+	0x5b, 0x88, 0x8a, 0x80, 0x94, 0x01, 0x00, 0x00,
 }
diff --git a/cmd/protoc-gen-go/testdata/proto2/fields.pb.go b/cmd/protoc-gen-go/testdata/proto2/fields.pb.go
index bba5924..c922a2b 100644
--- a/cmd/protoc-gen-go/testdata/proto2/fields.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/fields.pb.go
@@ -1585,6 +1585,7 @@
 var xxx_messageInfo_FieldTestMessage_Message proto.InternalMessageInfo
 
 func init() {
+	proto.RegisterEnum("goproto.protoc.proto2.FieldTestMessage_Enum", FieldTestMessage_Enum_name, FieldTestMessage_Enum_value)
 	proto.RegisterType((*FieldTestMessage)(nil), "goproto.protoc.proto2.FieldTestMessage")
 	proto.RegisterMapType((map[uint64]FieldTestMessage_Enum)(nil), "goproto.protoc.proto2.FieldTestMessage.MapFixed64EnumEntry")
 	proto.RegisterMapType((map[int32]int64)(nil), "goproto.protoc.proto2.FieldTestMessage.MapInt32Int64Entry")
@@ -1594,126 +1595,125 @@
 	proto.RegisterType((*FieldTestMessage_RepeatedGroup)(nil), "goproto.protoc.proto2.FieldTestMessage.RepeatedGroup")
 	proto.RegisterType((*FieldTestMessage_OneofGroup)(nil), "goproto.protoc.proto2.FieldTestMessage.OneofGroup")
 	proto.RegisterType((*FieldTestMessage_Message)(nil), "goproto.protoc.proto2.FieldTestMessage.Message")
-	proto.RegisterEnum("goproto.protoc.proto2.FieldTestMessage_Enum", FieldTestMessage_Enum_name, FieldTestMessage_Enum_value)
 }
 
 func init() { proto.RegisterFile("proto2/fields.proto", fileDescriptor_fd8a9d72b841fd68) }
 
 var fileDescriptor_fd8a9d72b841fd68 = []byte{
-	// 1825 bytes of a gzipped FileDescriptorProto
+	// 1831 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x98, 0x59, 0x73, 0x13, 0xcb,
 	0x15, 0xc7, 0x3d, 0x33, 0x92, 0x6d, 0xb5, 0x25, 0x4b, 0x1e, 0x43, 0x55, 0x87, 0xa7, 0x0e, 0x21,
-	0x61, 0x08, 0xd8, 0x8e, 0xc5, 0x30, 0x80, 0xa9, 0x54, 0xa5, 0x5c, 0xb1, 0xe3, 0x3c, 0x04, 0x92,
-	0x09, 0xae, 0x54, 0x41, 0xaa, 0x5c, 0x83, 0x3d, 0x52, 0x14, 0xa4, 0x19, 0x21, 0x8d, 0x00, 0x7f,
-	0x8b, 0xac, 0x1f, 0x23, 0xfb, 0x7a, 0xb9, 0xdc, 0x0f, 0x70, 0xf7, 0x7d, 0x01, 0xee, 0xbe, 0x2f,
-	0xaf, 0xf7, 0xde, 0xe7, 0x5b, 0xa7, 0x4f, 0x77, 0x4f, 0xf7, 0xc8, 0x0f, 0xb6, 0x9f, 0xb0, 0x8e,
-	0xfe, 0x7d, 0xfe, 0xe7, 0x34, 0xfd, 0x3b, 0xea, 0x19, 0x32, 0xdf, 0x1f, 0xa4, 0x59, 0xda, 0x5c,
-	0x6a, 0x75, 0xe2, 0xee, 0xce, 0x70, 0x91, 0x7f, 0x72, 0x8f, 0xb6, 0x53, 0xfe, 0x07, 0x7e, 0xdc,
-	0xc6, 0x7f, 0x9a, 0xc7, 0xef, 0x9d, 0x26, 0x8d, 0x75, 0xd0, 0x5d, 0x8d, 0x87, 0xd9, 0xcf, 0xe2,
-	0xe1, 0x30, 0x6a, 0xc7, 0xee, 0x77, 0x48, 0x2d, 0xed, 0x67, 0x9d, 0x34, 0x89, 0xba, 0x5b, 0x37,
-	0xd2, 0xb4, 0x4b, 0x2d, 0x66, 0x79, 0xd3, 0x61, 0x55, 0x06, 0x57, 0xd3, 0xb4, 0xeb, 0xfe, 0x42,
-	0x13, 0xc5, 0xc9, 0xa8, 0x47, 0x6d, 0x66, 0x79, 0xb3, 0xcd, 0x33, 0x8b, 0x7b, 0x1a, 0x2d, 0x16,
-	0x4d, 0x16, 0xd7, 0x92, 0x51, 0x2f, 0x4f, 0x09, 0x9f, 0xdc, 0xef, 0x92, 0x59, 0x95, 0xb2, 0x93,
-	0x64, 0x67, 0x9b, 0xd4, 0x61, 0x96, 0x57, 0x0e, 0x95, 0xd1, 0x4f, 0x21, 0xe8, 0x9e, 0x24, 0x75,
-	0x25, 0x1b, 0xa2, 0xae, 0xc4, 0x2c, 0x6f, 0x2e, 0x54, 0xab, 0x7f, 0xd9, 0x19, 0x13, 0x8e, 0x50,
-	0x58, 0x66, 0x96, 0x57, 0xcb, 0x85, 0x9b, 0x28, 0x2c, 0x18, 0x07, 0x3e, 0x9d, 0x64, 0x96, 0xe7,
-	0x18, 0xc6, 0x81, 0x3f, 0x66, 0x1c, 0xf8, 0x74, 0x8a, 0x59, 0x9e, 0x6b, 0x1a, 0x17, 0x84, 0x23,
-	0x14, 0x4e, 0x33, 0xcb, 0x2b, 0x99, 0xc6, 0x81, 0xef, 0x9e, 0x26, 0x73, 0x79, 0xc6, 0x56, 0xe7,
-	0x6e, 0xbc, 0x73, 0xb6, 0x49, 0x2b, 0xcc, 0xf2, 0xea, 0x61, 0x43, 0xe5, 0x14, 0x71, 0xf7, 0x14,
-	0x51, 0xb1, 0x2d, 0xa9, 0x25, 0xcc, 0xf2, 0xa6, 0x42, 0xe5, 0xb6, 0x2e, 0xa4, 0x7a, 0x43, 0xad,
-	0x6e, 0x1a, 0x65, 0x74, 0x86, 0x59, 0x9e, 0x9d, 0x37, 0xb4, 0x0e, 0xc1, 0x3d, 0xec, 0x03, 0x9f,
-	0x56, 0x99, 0xe5, 0x35, 0x8a, 0xf6, 0x81, 0x3f, 0x6e, 0x1f, 0xf8, 0xb4, 0xc6, 0x2c, 0x6f, 0xb2,
-	0x60, 0x5f, 0xe8, 0x7f, 0x27, 0x1d, 0xdd, 0xe8, 0xc6, 0x74, 0x96, 0x59, 0x9e, 0x95, 0xf7, 0xff,
-	0x63, 0x1e, 0x35, 0x77, 0x34, 0x1b, 0x74, 0x92, 0x36, 0xad, 0x33, 0xcb, 0xab, 0x68, 0x3b, 0xca,
-	0xa3, 0x46, 0x43, 0x37, 0x76, 0xb3, 0x78, 0x48, 0x1b, 0xcc, 0xf2, 0xaa, 0x79, 0x43, 0xab, 0x10,
-	0x74, 0xaf, 0x69, 0x35, 0x8a, 0x83, 0x46, 0xe7, 0x98, 0xe5, 0xcd, 0x34, 0x97, 0xf6, 0x7b, 0x2e,
-	0xc5, 0xbf, 0x79, 0x53, 0x92, 0x8a, 0xeb, 0xf9, 0x81, 0x6f, 0x0f, 0xd2, 0x51, 0x9f, 0xba, 0xcc,
-	0xf2, 0x48, 0xf3, 0xdc, 0x7e, 0x13, 0x5f, 0x11, 0x8b, 0x7f, 0x02, 0x8b, 0x43, 0x33, 0x17, 0x20,
-	0x37, 0x88, 0x6f, 0x8d, 0x3a, 0x83, 0x78, 0x07, 0x91, 0x8b, 0x99, 0x0d, 0xc8, 0xc9, 0xa0, 0x44,
-	0x4e, 0x89, 0x38, 0x72, 0x2d, 0x66, 0x1f, 0x1c, 0x39, 0x99, 0x42, 0x22, 0xa7, 0x52, 0x22, 0x21,
-	0x6d, 0x66, 0x03, 0x72, 0x32, 0xaa, 0x90, 0x53, 0x32, 0x81, 0xdc, 0x6f, 0x98, 0x0d, 0xc8, 0xc9,
-	0x70, 0x8e, 0x9c, 0x12, 0x0a, 0xe4, 0x3a, 0xcc, 0x06, 0xe4, 0x64, 0x38, 0x47, 0x4e, 0x37, 0x0e,
-	0x7c, 0xfa, 0x5b, 0x66, 0x03, 0x72, 0x9a, 0x31, 0x9e, 0x24, 0xc3, 0x38, 0xf0, 0xe9, 0x4d, 0x66,
-	0x03, 0x72, 0xba, 0x71, 0x41, 0x28, 0x90, 0xeb, 0x32, 0x1b, 0x90, 0xd3, 0x8d, 0x11, 0xb9, 0x3c,
-	0xa3, 0xc4, 0xa8, 0xc7, 0x6c, 0x40, 0x4e, 0xe5, 0xd4, 0x90, 0x53, 0x62, 0xa9, 0x4d, 0x98, 0x0d,
-	0xc8, 0xc9, 0xb8, 0x86, 0x5c, 0x2e, 0xe5, 0xc8, 0xa5, 0xcc, 0x06, 0xe4, 0x94, 0x50, 0x22, 0x57,
-	0xb0, 0x0f, 0x7c, 0xda, 0x67, 0x36, 0x20, 0x67, 0xda, 0x23, 0x72, 0xa6, 0x7d, 0xe0, 0xd3, 0x5b,
-	0xcc, 0x06, 0xe4, 0x0c, 0xfb, 0x42, 0xff, 0x02, 0xb9, 0x01, 0xb3, 0x01, 0x39, 0x19, 0xce, 0x91,
-	0xcb, 0x0b, 0x40, 0xe4, 0x86, 0xcc, 0x06, 0xe4, 0x94, 0xbd, 0x42, 0x2e, 0x3f, 0x92, 0x1c, 0xb9,
-	0x8c, 0xd9, 0x80, 0x9c, 0x3a, 0x93, 0x12, 0x39, 0x25, 0x93, 0xc8, 0x8d, 0x98, 0x7d, 0x28, 0xe4,
-	0x64, 0x22, 0x0d, 0x39, 0x19, 0x42, 0xe4, 0x6e, 0x33, 0xfb, 0x20, 0xc8, 0x85, 0x62, 0xb1, 0x40,
-	0xce, 0xc8, 0xe5, 0x9e, 0x80, 0xe4, 0xfd, 0x38, 0xca, 0x24, 0x72, 0x4f, 0x5a, 0xcc, 0x41, 0xe6,
-	0x30, 0xca, 0x99, 0x0b, 0x35, 0x15, 0x67, 0xee, 0x29, 0x50, 0x1d, 0x02, 0x3a, 0xcc, 0xc1, 0xa1,
-	0xfb, 0x1e, 0xec, 0xac, 0xc8, 0x89, 0x8c, 0x3c, 0x0d, 0x49, 0x39, 0x75, 0x18, 0x46, 0xea, 0x3c,
-	0xf8, 0xaf, 0x12, 0x3a, 0x41, 0xdd, 0x33, 0x20, 0xe4, 0xd8, 0x61, 0x5c, 0x60, 0xa7, 0x2b, 0x05,
-	0x76, 0xcf, 0x82, 0xb2, 0x96, 0x2b, 0x05, 0x77, 0x05, 0xef, 0xc0, 0xa7, 0xcf, 0x81, 0xd0, 0x31,
-	0xbc, 0x03, 0x7f, 0xcc, 0x3b, 0xf0, 0xe9, 0xf3, 0x20, 0x74, 0x4d, 0xef, 0x82, 0x52, 0x90, 0xf7,
-	0x02, 0x28, 0x4b, 0xa6, 0x77, 0xe0, 0xbb, 0x67, 0xe0, 0xec, 0xcb, 0x9c, 0x12, 0xa7, 0x17, 0x41,
-	0xcb, 0xd9, 0x13, 0x59, 0x25, 0x7b, 0xdf, 0x27, 0x2a, 0xa6, 0xd8, 0x7b, 0x09, 0xc4, 0x1c, 0x3e,
-	0xfc, 0x42, 0xc2, 0xa7, 0x77, 0x85, 0xf0, 0xbd, 0x0c, 0x4a, 0x3b, 0xef, 0x0a, 0xe9, 0x1b, 0xaf,
-	0x20, 0xf0, 0xe9, 0x2b, 0x20, 0x6d, 0x14, 0x2b, 0x08, 0xfc, 0xf1, 0x0a, 0x02, 0x9f, 0xbe, 0x0a,
-	0xe2, 0xc9, 0x42, 0x05, 0x85, 0x5d, 0x10, 0xfc, 0xbd, 0x06, 0x52, 0x2b, 0xdf, 0x05, 0x01, 0xa0,
-	0xb1, 0xb3, 0x08, 0xe0, 0xeb, 0xa0, 0xac, 0x68, 0x3b, 0x8b, 0x04, 0xea, 0x5d, 0x21, 0x81, 0x6f,
-	0x80, 0xb0, 0x9a, 0x77, 0x85, 0x08, 0x5e, 0xd7, 0xea, 0x94, 0x08, 0x3e, 0x00, 0xe5, 0xe1, 0x18,
-	0xc4, 0x4c, 0x92, 0xc1, 0x5f, 0xe7, 0x00, 0x20, 0x83, 0x0f, 0x21, 0xf3, 0x81, 0x20, 0xc4, 0xd5,
-	0x0a, 0x42, 0x2d, 0x99, 0xeb, 0x91, 0xea, 0x4e, 0xdc, 0x8a, 0x46, 0xdd, 0x0c, 0x19, 0xfc, 0x0b,
-	0xdc, 0x22, 0xa7, 0x57, 0x4a, 0xd9, 0x60, 0x14, 0x87, 0x33, 0xe2, 0x2b, 0x0e, 0xe2, 0x66, 0xae,
-	0xe4, 0x1c, 0xfe, 0xf5, 0x10, 0xf7, 0xcd, 0x15, 0xe7, 0xca, 0xe5, 0x35, 0x95, 0x96, 0xb3, 0x78,
-	0x92, 0xd4, 0x64, 0x5a, 0xe4, 0xe6, 0x6f, 0x90, 0xb7, 0xbc, 0x62, 0x2d, 0x87, 0xd2, 0x0f, 0x61,
-	0x3c, 0x45, 0x66, 0xa5, 0x50, 0xb0, 0xf8, 0x77, 0x50, 0xce, 0x81, 0x52, 0xa6, 0x10, 0x34, 0x6a,
-	0x52, 0x01, 0xe3, 0x3f, 0x40, 0x5a, 0xd3, 0xa5, 0x9b, 0xf2, 0xf7, 0x52, 0xb7, 0x0f, 0x7c, 0xfa,
-	0x4f, 0x50, 0x3a, 0x05, 0x7b, 0xfe, 0x53, 0x60, 0xd8, 0x07, 0x3e, 0xfd, 0x17, 0x28, 0xdd, 0xa2,
-	0xbd, 0x29, 0x15, 0x3c, 0xfe, 0x1b, 0xa4, 0xa5, 0xa2, 0x7d, 0xe0, 0xbb, 0x0b, 0xa4, 0xa1, 0xb2,
-	0x4a, 0xc6, 0xfe, 0x03, 0xe2, 0x3a, 0x88, 0xeb, 0x32, 0xaf, 0x44, 0xf2, 0x34, 0x91, 0x21, 0x45,
-	0xe4, 0x7f, 0x41, 0x3d, 0x05, 0x6a, 0x69, 0xba, 0xae, 0x7e, 0x3b, 0x55, 0x6b, 0x88, 0xe4, 0xff,
-	0x40, 0x6a, 0xaf, 0x38, 0xcb, 0x8b, 0xe7, 0x54, 0x73, 0x88, 0xe5, 0x58, 0x19, 0x81, 0x4f, 0xff,
-	0x0f, 0xea, 0xc6, 0x78, 0x19, 0xfc, 0x27, 0xdc, 0x2c, 0x23, 0xf0, 0xe9, 0x63, 0xa0, 0x9e, 0x1c,
-	0x2b, 0x83, 0x8b, 0xd5, 0x6e, 0x08, 0x2e, 0xef, 0x81, 0xd6, 0xc2, 0x3a, 0x64, 0x89, 0x82, 0x4d,
-	0x4d, 0x2c, 0xd0, 0x7c, 0x1c, 0xc4, 0x95, 0x15, 0xe7, 0xee, 0x99, 0xdd, 0x7c, 0x9f, 0x11, 0x4f,
-	0xad, 0x41, 0xa4, 0xf3, 0x3e, 0x68, 0xab, 0xa8, 0x95, 0x0d, 0x22, 0xa1, 0xe7, 0xc9, 0x11, 0x63,
-	0x2f, 0xb6, 0x92, 0xb8, 0xdd, 0x49, 0x5a, 0xf4, 0x77, 0x0e, 0xdf, 0x92, 0xd2, 0x42, 0x27, 0x69,
-	0x85, 0xae, 0xbe, 0x27, 0x97, 0xb9, 0xc0, 0x0d, 0x8a, 0x0b, 0xfb, 0xe9, 0x10, 0x16, 0xfe, 0x1e,
-	0x17, 0x3a, 0x63, 0xeb, 0x7e, 0xce, 0xbf, 0x77, 0x7f, 0x40, 0xe6, 0x0a, 0x86, 0x51, 0x42, 0xff,
-	0x20, 0x16, 0x25, 0x51, 0xa2, 0x36, 0x15, 0xcd, 0xa2, 0xc4, 0xbd, 0x48, 0x8e, 0x9a, 0xfb, 0x24,
-	0x6b, 0xfc, 0xa3, 0xc3, 0xb7, 0x0b, 0x6b, 0x9c, 0x37, 0xf6, 0x4b, 0x14, 0x79, 0x61, 0x6c, 0xa9,
-	0xa8, 0xf2, 0x4f, 0xb8, 0xd4, 0x19, 0x5f, 0x29, 0xca, 0x6c, 0x12, 0xb7, 0x68, 0x1a, 0x25, 0xf4,
-	0xcf, 0x62, 0x19, 0xd4, 0xd9, 0x30, 0x0d, 0xa3, 0xc4, 0xdd, 0x26, 0xf5, 0x5e, 0xd4, 0x47, 0x5a,
-	0x05, 0x34, 0x5f, 0x3a, 0x7c, 0xd8, 0xad, 0xec, 0x7b, 0xd8, 0x45, 0x7d, 0x0e, 0x35, 0x47, 0x6b,
-	0x2d, 0xc9, 0x06, 0xbb, 0x61, 0xad, 0xa7, 0xc7, 0xdc, 0x2e, 0x71, 0xc1, 0x04, 0x0f, 0xc1, 0x56,
-	0x4f, 0x0c, 0xd5, 0xaf, 0xd0, 0xe7, 0x87, 0x07, 0xf0, 0xc1, 0xb3, 0x22, 0x02, 0x68, 0xd5, 0xe8,
-	0x15, 0xc2, 0x6e, 0x8b, 0x40, 0x4c, 0x1e, 0x66, 0x9c, 0x6f, 0x5f, 0xa3, 0xd7, 0xa5, 0x03, 0x78,
-	0x89, 0x23, 0x0f, 0x73, 0x0d, 0x9d, 0x66, 0x7b, 0x46, 0xd0, 0x65, 0x84, 0xa4, 0x49, 0x9c, 0xb6,
-	0x70, 0xd6, 0x3e, 0x80, 0xa7, 0xe6, 0xe9, 0x8d, 0x89, 0xb0, 0xc2, 0x83, 0x7c, 0xca, 0x5e, 0x96,
-	0x0a, 0x5e, 0xc3, 0xc3, 0xd2, 0xc1, 0x67, 0xac, 0xca, 0xc7, 0x1d, 0x8f, 0x93, 0x19, 0xcc, 0x87,
-	0x73, 0xf0, 0x11, 0x24, 0x2c, 0x6f, 0x4c, 0x84, 0xe8, 0x82, 0x93, 0xf5, 0x04, 0xa9, 0xa2, 0x46,
-	0xcc, 0xd5, 0x37, 0xf9, 0xd3, 0xfc, 0xc6, 0x44, 0x88, 0x4b, 0xc5, 0x50, 0x55, 0x2a, 0x31, 0x52,
-	0xdf, 0x02, 0x55, 0x4d, 0xa9, 0xc4, 0x3c, 0xd5, 0xfd, 0x02, 0x9f, 0xbe, 0x0d, 0x22, 0x47, 0xf7,
-	0x0b, 0x7c, 0xd3, 0x2f, 0xf0, 0xe9, 0x3b, 0x20, 0x72, 0x0d, 0x3f, 0x5d, 0x25, 0x66, 0xe8, 0xbb,
-	0xa0, 0x2a, 0x19, 0x7e, 0xfc, 0x67, 0x7f, 0x56, 0xe4, 0x92, 0x03, 0xf1, 0x3d, 0xd0, 0xd5, 0x37,
-	0x26, 0xc2, 0x1a, 0x66, 0x6b, 0xa9, 0x2b, 0x0a, 0x06, 0xd4, 0xe4, 0x7c, 0x1f, 0x84, 0x53, 0x1b,
-	0x13, 0x21, 0xfa, 0xc8, 0xb1, 0xa9, 0x3a, 0xc0, 0xa1, 0xf9, 0x01, 0xa8, 0x6c, 0xd5, 0x01, 0xce,
-	0xcb, 0x82, 0x6b, 0xe0, 0xd3, 0x0f, 0x41, 0xd6, 0x28, 0xb8, 0x06, 0x7e, 0xc1, 0x35, 0xf0, 0xe9,
-	0x47, 0x20, 0x9c, 0x34, 0x5d, 0xf5, 0x6e, 0xc5, 0x8c, 0xfc, 0x18, 0x64, 0x96, 0xea, 0x56, 0x8c,
-	0xc7, 0x7c, 0xe7, 0x70, 0x38, 0x7e, 0x02, 0xaa, 0x4a, 0xbe, 0x73, 0x38, 0x17, 0x55, 0x07, 0x38,
-	0x15, 0x3f, 0x05, 0x51, 0x55, 0x75, 0x80, 0x03, 0xf1, 0x57, 0xb2, 0x2e, 0x79, 0x5f, 0xf9, 0xac,
-	0x74, 0xa8, 0xc7, 0x74, 0xd5, 0x88, 0x44, 0x69, 0x53, 0x1c, 0x60, 0xbc, 0xab, 0x7c, 0x5e, 0xe2,
-	0xcf, 0xe8, 0xcd, 0x7d, 0x3f, 0xa3, 0xc3, 0x52, 0x7e, 0x51, 0x51, 0xf5, 0xe2, 0x3d, 0xe5, 0xdb,
-	0xb2, 0xa7, 0xec, 0x4e, 0xba, 0xb5, 0x4c, 0xef, 0x97, 0xf9, 0x39, 0xb6, 0xc4, 0x51, 0xbf, 0x7a,
-	0x27, 0x5d, 0x36, 0x25, 0x4d, 0xfa, 0x44, 0x99, 0x1f, 0x3d, 0x4d, 0xd2, 0x3c, 0x16, 0x90, 0x9a,
-	0xf1, 0x16, 0xc0, 0x78, 0xad, 0x81, 0x15, 0xcf, 0xf3, 0xd7, 0x1f, 0xea, 0xed, 0x00, 0x97, 0xc1,
-	0x3a, 0xe3, 0x51, 0xc6, 0x78, 0x36, 0xc3, 0x75, 0x77, 0xf8, 0x33, 0x9c, 0x7a, 0xc4, 0xc1, 0x75,
-	0xe7, 0x61, 0x9d, 0x76, 0xfb, 0x32, 0x6e, 0x94, 0xb8, 0xee, 0x11, 0x5e, 0x3d, 0xd5, 0xb5, 0x0c,
-	0x17, 0xfe, 0x88, 0xb8, 0xe3, 0x33, 0xd2, 0x6d, 0x10, 0xe7, 0x66, 0xbc, 0xcb, 0xdf, 0x06, 0x96,
-	0x43, 0xf8, 0xd3, 0x3d, 0x42, 0xca, 0xb7, 0xa3, 0xee, 0x28, 0xe6, 0x2f, 0xff, 0x9c, 0x10, 0x3f,
-	0xac, 0xd8, 0x17, 0xac, 0x63, 0x19, 0x39, 0xba, 0xe7, 0xf4, 0xd3, 0x93, 0x54, 0x30, 0xc9, 0x9a,
-	0x9e, 0xe4, 0x10, 0x57, 0x56, 0xcd, 0x35, 0x25, 0xf3, 0x7b, 0xcc, 0x41, 0xdd, 0x73, 0x12, 0x3d,
-	0x57, 0x75, 0xcf, 0x83, 0x3e, 0xcd, 0x69, 0x86, 0x17, 0x09, 0xc9, 0xcf, 0x0c, 0x7f, 0x9f, 0xc6,
-	0x8f, 0x00, 0xdf, 0xdb, 0x2d, 0xfe, 0x02, 0x96, 0x7e, 0xc1, 0x21, 0x09, 0xeb, 0xa9, 0xd2, 0xf1,
-	0xac, 0xc7, 0x2a, 0x64, 0x4a, 0x64, 0x3d, 0xfe, 0x2d, 0x52, 0xe2, 0xd3, 0x72, 0x9a, 0x94, 0xae,
-	0xad, 0x85, 0x57, 0x1a, 0x13, 0xee, 0x14, 0x81, 0xab, 0x6a, 0xc3, 0x5a, 0xad, 0xa9, 0x71, 0x00,
-	0x8b, 0x56, 0x67, 0x48, 0x45, 0x1d, 0xb2, 0xd5, 0x4b, 0xd7, 0x2e, 0xb6, 0xd3, 0xb4, 0xdd, 0x8d,
-	0x17, 0xdb, 0x69, 0x37, 0x4a, 0xda, 0x8b, 0xe9, 0xa0, 0xbd, 0xc4, 0x2b, 0x5f, 0xda, 0xee, 0xed,
-	0xe0, 0x5f, 0xdb, 0x0b, 0xed, 0x38, 0x59, 0x68, 0xa7, 0x4b, 0x59, 0x3c, 0xcc, 0x76, 0xa2, 0x2c,
-	0xc2, 0x70, 0xf3, 0x9b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x36, 0x9c, 0x2d, 0xf1, 0x26, 0x16, 0x00,
-	0x00,
+	0x61, 0x08, 0xd8, 0x8e, 0xc5, 0x30, 0x80, 0x53, 0xa9, 0x24, 0xae, 0xd8, 0x71, 0x1e, 0x02, 0xc9,
+	0x04, 0x57, 0xaa, 0x20, 0x55, 0xae, 0xb1, 0x3d, 0x12, 0x0a, 0xd2, 0x8c, 0x90, 0x46, 0x80, 0xbf,
+	0x45, 0xd6, 0x8f, 0x91, 0x7d, 0x27, 0xe4, 0x03, 0x24, 0xb9, 0xfb, 0x0e, 0xdc, 0x7d, 0x5f, 0x5e,
+	0xef, 0xbd, 0xcf, 0xb7, 0x4e, 0x9f, 0xee, 0x9e, 0xee, 0x91, 0x1f, 0x6c, 0x3f, 0x61, 0x1d, 0xfd,
+	0xfb, 0xfc, 0xcf, 0x69, 0xfa, 0x77, 0xd4, 0x33, 0x64, 0xbe, 0x3f, 0x48, 0xb3, 0xb4, 0xb9, 0xd4,
+	0xea, 0xc4, 0xdd, 0xdd, 0xe1, 0x22, 0xff, 0xe4, 0x1e, 0x6f, 0xa7, 0xfc, 0x0f, 0xfc, 0xb8, 0x83,
+	0xff, 0x34, 0x4f, 0xde, 0x3f, 0x4b, 0x1a, 0xeb, 0xa0, 0xbb, 0x16, 0x0f, 0xb3, 0x1f, 0xc6, 0xc3,
+	0x61, 0xd4, 0x8e, 0xdd, 0xaf, 0x90, 0x5a, 0xda, 0xcf, 0x3a, 0x69, 0x12, 0x75, 0xb7, 0xb6, 0xd3,
+	0xb4, 0x4b, 0x2d, 0x66, 0x79, 0xd3, 0x61, 0x55, 0x06, 0x57, 0xd3, 0xb4, 0xeb, 0xfe, 0x58, 0x13,
+	0xc5, 0xc9, 0xa8, 0x47, 0x6d, 0x66, 0x79, 0xb3, 0xcd, 0x73, 0x8b, 0xfb, 0x1a, 0x2d, 0x16, 0x4d,
+	0x16, 0xd7, 0x92, 0x51, 0x2f, 0x4f, 0x09, 0x9f, 0xdc, 0xaf, 0x92, 0x59, 0x95, 0xb2, 0x93, 0x64,
+	0xe7, 0x9b, 0xd4, 0x61, 0x96, 0x57, 0x0e, 0x95, 0xd1, 0x0f, 0x20, 0xe8, 0x9e, 0x26, 0x75, 0x25,
+	0x1b, 0xa2, 0xae, 0xc4, 0x2c, 0x6f, 0x2e, 0x54, 0xab, 0x7f, 0xd2, 0x19, 0x13, 0x8e, 0x50, 0x58,
+	0x66, 0x96, 0x57, 0xcb, 0x85, 0x9b, 0x28, 0x2c, 0x18, 0x07, 0x3e, 0x9d, 0x64, 0x96, 0xe7, 0x18,
+	0xc6, 0x81, 0x3f, 0x66, 0x1c, 0xf8, 0x74, 0x8a, 0x59, 0x9e, 0x6b, 0x1a, 0x17, 0x84, 0x23, 0x14,
+	0x4e, 0x33, 0xcb, 0x2b, 0x99, 0xc6, 0x81, 0xef, 0x9e, 0x25, 0x73, 0x79, 0xc6, 0x56, 0xe7, 0x5e,
+	0xbc, 0x7b, 0xbe, 0x49, 0x2b, 0xcc, 0xf2, 0xea, 0x61, 0x43, 0xe5, 0x14, 0x71, 0xf7, 0x0c, 0x51,
+	0xb1, 0x2d, 0xa9, 0x25, 0xcc, 0xf2, 0xa6, 0x42, 0xe5, 0xb6, 0x2e, 0xa4, 0x7a, 0x43, 0xad, 0x6e,
+	0x1a, 0x65, 0x74, 0x86, 0x59, 0x9e, 0x9d, 0x37, 0xb4, 0x0e, 0xc1, 0x7d, 0xec, 0x03, 0x9f, 0x56,
+	0x99, 0xe5, 0x35, 0x8a, 0xf6, 0x81, 0x3f, 0x6e, 0x1f, 0xf8, 0xb4, 0xc6, 0x2c, 0x6f, 0xb2, 0x60,
+	0x5f, 0xe8, 0x7f, 0x37, 0x1d, 0x6d, 0x77, 0x63, 0x3a, 0xcb, 0x2c, 0xcf, 0xca, 0xfb, 0xff, 0x1e,
+	0x8f, 0x9a, 0x3b, 0x9a, 0x0d, 0x3a, 0x49, 0x9b, 0xd6, 0x99, 0xe5, 0x55, 0xb4, 0x1d, 0xe5, 0x51,
+	0xa3, 0xa1, 0xed, 0xbd, 0x2c, 0x1e, 0xd2, 0x06, 0xb3, 0xbc, 0x6a, 0xde, 0xd0, 0x2a, 0x04, 0xdd,
+	0xeb, 0x5a, 0x8d, 0xe2, 0xa0, 0xd1, 0x39, 0x66, 0x79, 0x33, 0xcd, 0xa5, 0x83, 0x9e, 0x4b, 0xf1,
+	0x6f, 0xde, 0x94, 0xa4, 0xe2, 0x46, 0x7e, 0xe0, 0xdb, 0x83, 0x74, 0xd4, 0xa7, 0x2e, 0xb3, 0x3c,
+	0xd2, 0xbc, 0x70, 0xd0, 0xc4, 0x57, 0xc5, 0xe2, 0xef, 0xc3, 0xe2, 0xd0, 0xcc, 0x05, 0xc8, 0x0d,
+	0xe2, 0xdb, 0xa3, 0xce, 0x20, 0xde, 0x45, 0xe4, 0x62, 0x66, 0x03, 0x72, 0x32, 0x28, 0x91, 0x53,
+	0x22, 0x8e, 0x5c, 0x8b, 0xd9, 0x87, 0x47, 0x4e, 0xa6, 0x90, 0xc8, 0xa9, 0x94, 0x48, 0x48, 0x9b,
+	0xd9, 0x80, 0x9c, 0x8c, 0x2a, 0xe4, 0x94, 0x4c, 0x20, 0x77, 0x93, 0xd9, 0x80, 0x9c, 0x0c, 0xe7,
+	0xc8, 0x29, 0xa1, 0x40, 0xae, 0xc3, 0x6c, 0x40, 0x4e, 0x86, 0x73, 0xe4, 0x74, 0xe3, 0xc0, 0xa7,
+	0x3f, 0x67, 0x36, 0x20, 0xa7, 0x19, 0xe3, 0x49, 0x32, 0x8c, 0x03, 0x9f, 0xde, 0x62, 0x36, 0x20,
+	0xa7, 0x1b, 0x17, 0x84, 0x02, 0xb9, 0x2e, 0xb3, 0x01, 0x39, 0xdd, 0x18, 0x91, 0xcb, 0x33, 0x4a,
+	0x8c, 0x7a, 0xcc, 0x06, 0xe4, 0x54, 0x4e, 0x0d, 0x39, 0x25, 0x96, 0xda, 0x84, 0xd9, 0x80, 0x9c,
+	0x8c, 0x6b, 0xc8, 0xe5, 0x52, 0x8e, 0x5c, 0xca, 0x6c, 0x40, 0x4e, 0x09, 0x25, 0x72, 0x05, 0xfb,
+	0xc0, 0xa7, 0x7d, 0x66, 0x03, 0x72, 0xa6, 0x3d, 0x22, 0x67, 0xda, 0x07, 0x3e, 0xbd, 0xcd, 0x6c,
+	0x40, 0xce, 0xb0, 0x2f, 0xf4, 0x2f, 0x90, 0x1b, 0x30, 0x1b, 0x90, 0x93, 0xe1, 0x1c, 0xb9, 0xbc,
+	0x00, 0x44, 0x6e, 0xc8, 0x6c, 0x40, 0x4e, 0xd9, 0x2b, 0xe4, 0xf2, 0x23, 0xc9, 0x91, 0xcb, 0x98,
+	0x0d, 0xc8, 0xa9, 0x33, 0x29, 0x91, 0x53, 0x32, 0x89, 0xdc, 0x88, 0xd9, 0x47, 0x42, 0x4e, 0x26,
+	0xd2, 0x90, 0x93, 0x21, 0x44, 0xee, 0x0e, 0xb3, 0x0f, 0x83, 0x5c, 0x28, 0x16, 0x0b, 0xe4, 0x8c,
+	0x5c, 0xee, 0x29, 0x48, 0xde, 0x8f, 0xa3, 0x4c, 0x22, 0xf7, 0x5f, 0x8b, 0x39, 0xc8, 0x1c, 0x46,
+	0x39, 0x73, 0xa1, 0xa6, 0xe2, 0xcc, 0xfd, 0x0f, 0x54, 0x47, 0x80, 0x0e, 0x73, 0x70, 0xe8, 0xbe,
+	0x06, 0x3b, 0x2b, 0x72, 0x22, 0x23, 0xff, 0x87, 0xa4, 0x9c, 0x3a, 0x0c, 0x23, 0x75, 0x1e, 0xfc,
+	0x57, 0x09, 0x9d, 0xa0, 0xee, 0x09, 0x10, 0x72, 0xec, 0x30, 0x2e, 0xb0, 0xd3, 0x95, 0x02, 0xbb,
+	0x27, 0x41, 0x59, 0xcb, 0x95, 0x82, 0xbb, 0x82, 0x77, 0xe0, 0xd3, 0xa7, 0x40, 0xe8, 0x18, 0xde,
+	0x81, 0x3f, 0xe6, 0x1d, 0xf8, 0xf4, 0x69, 0x10, 0xba, 0xa6, 0x77, 0x41, 0x29, 0xc8, 0x7b, 0x06,
+	0x94, 0x25, 0xd3, 0x3b, 0xf0, 0xdd, 0x73, 0x70, 0xf6, 0x65, 0x4e, 0x89, 0xd3, 0xb3, 0xa0, 0xe5,
+	0xec, 0x89, 0xac, 0x92, 0xbd, 0xaf, 0x13, 0x15, 0x53, 0xec, 0x3d, 0x07, 0x62, 0x0e, 0x1f, 0x7e,
+	0x21, 0xe1, 0xd3, 0xbb, 0x42, 0xf8, 0x9e, 0x07, 0xa5, 0x9d, 0x77, 0x85, 0xf4, 0x8d, 0x57, 0x10,
+	0xf8, 0xf4, 0x05, 0x90, 0x36, 0x8a, 0x15, 0x04, 0xfe, 0x78, 0x05, 0x81, 0x4f, 0x5f, 0x04, 0xf1,
+	0x64, 0xa1, 0x82, 0xc2, 0x2e, 0x08, 0xfe, 0x5e, 0x02, 0xa9, 0x95, 0xef, 0x82, 0x00, 0xd0, 0xd8,
+	0x59, 0x04, 0xf0, 0x65, 0x50, 0x56, 0xb4, 0x9d, 0x45, 0x02, 0xf5, 0xae, 0x90, 0xc0, 0x57, 0x40,
+	0x58, 0xcd, 0xbb, 0x42, 0x04, 0x6f, 0x68, 0x75, 0x4a, 0x04, 0x1f, 0x82, 0xf2, 0x68, 0x0c, 0x62,
+	0x26, 0xc9, 0xe0, 0xcf, 0x72, 0x00, 0x90, 0xc1, 0x47, 0x90, 0xf9, 0x50, 0x10, 0xe2, 0x6a, 0x05,
+	0xa1, 0x96, 0xcc, 0xf5, 0x48, 0x75, 0x37, 0x6e, 0x45, 0xa3, 0x6e, 0x86, 0x0c, 0xfe, 0x0e, 0x6e,
+	0x91, 0xd3, 0x2b, 0xa5, 0x6c, 0x30, 0x8a, 0xc3, 0x19, 0xf1, 0x15, 0x07, 0x71, 0x33, 0x57, 0x72,
+	0x0e, 0x7f, 0x7f, 0x84, 0xfb, 0xe6, 0x8a, 0x73, 0xf5, 0xca, 0x9a, 0x4a, 0xcb, 0x59, 0x3c, 0x4d,
+	0x6a, 0x32, 0x2d, 0x72, 0xf3, 0x07, 0xc8, 0x5b, 0x5e, 0xb1, 0x96, 0x43, 0xe9, 0x87, 0x30, 0x9e,
+	0x21, 0xb3, 0x52, 0x28, 0x58, 0xfc, 0x23, 0x28, 0xe7, 0x40, 0x29, 0x53, 0x08, 0x1a, 0x35, 0xa9,
+	0x80, 0xf1, 0x4f, 0x20, 0xad, 0xe9, 0xd2, 0x4d, 0xf9, 0x7b, 0xa9, 0xdb, 0x07, 0x3e, 0xfd, 0x33,
+	0x28, 0x9d, 0x82, 0x3d, 0xff, 0x29, 0x30, 0xec, 0x03, 0x9f, 0xfe, 0x05, 0x94, 0x6e, 0xd1, 0xde,
+	0x94, 0x0a, 0x1e, 0xff, 0x0a, 0xd2, 0x52, 0xd1, 0x3e, 0xf0, 0xdd, 0x05, 0xd2, 0x50, 0x59, 0x25,
+	0x63, 0x7f, 0x03, 0x71, 0x1d, 0xc4, 0x75, 0x99, 0x57, 0x22, 0x79, 0x96, 0xc8, 0x90, 0x22, 0xf2,
+	0xef, 0xa0, 0x9e, 0x02, 0xb5, 0x34, 0x5d, 0x57, 0xbf, 0x9d, 0xaa, 0x35, 0x44, 0xf2, 0x1f, 0x20,
+	0xb5, 0x57, 0x9c, 0xe5, 0xc5, 0x0b, 0xaa, 0x39, 0xc4, 0x72, 0xac, 0x8c, 0xc0, 0xa7, 0xff, 0x04,
+	0x75, 0x63, 0xbc, 0x0c, 0xfe, 0x13, 0x6e, 0x96, 0x11, 0xf8, 0xf4, 0x5f, 0xa0, 0x9e, 0x1c, 0x2b,
+	0x83, 0x8b, 0xd5, 0x6e, 0x08, 0x2e, 0xef, 0x83, 0xd6, 0xc2, 0x3a, 0x64, 0x89, 0x82, 0x4d, 0x4d,
+	0x2c, 0xd0, 0xfc, 0x37, 0x88, 0x2b, 0x2b, 0xce, 0xbd, 0x73, 0x7b, 0xf9, 0x3e, 0x23, 0x9e, 0x5a,
+	0x83, 0x48, 0xe7, 0x03, 0xd0, 0x56, 0x51, 0x2b, 0x1b, 0x44, 0x42, 0x2f, 0x92, 0x63, 0xc6, 0x5e,
+	0x6c, 0x25, 0x71, 0xbb, 0x93, 0xb4, 0xe8, 0x2f, 0x1c, 0xbe, 0x25, 0xa5, 0x85, 0x4e, 0xd2, 0x0a,
+	0x5d, 0x7d, 0x4f, 0xae, 0x70, 0x81, 0x1b, 0x14, 0x17, 0xf6, 0xd3, 0x21, 0x2c, 0xfc, 0x25, 0x2e,
+	0x74, 0xc6, 0xd6, 0xfd, 0x88, 0x7f, 0xef, 0x7e, 0x83, 0xcc, 0x15, 0x0c, 0xa3, 0x84, 0xfe, 0x4a,
+	0x2c, 0x4a, 0xa2, 0x44, 0x6d, 0x2a, 0x9a, 0x45, 0x89, 0x7b, 0x99, 0x1c, 0x37, 0xf7, 0x49, 0xd6,
+	0xf8, 0x6b, 0x87, 0x6f, 0x17, 0xd6, 0x38, 0x6f, 0xec, 0x97, 0x28, 0xf2, 0xd2, 0xd8, 0x52, 0x51,
+	0xe5, 0x6f, 0x70, 0xa9, 0x33, 0xbe, 0x52, 0x94, 0xd9, 0x24, 0x6e, 0xd1, 0x34, 0x4a, 0xe8, 0x6f,
+	0xc5, 0x32, 0xa8, 0xb3, 0x61, 0x1a, 0x46, 0x89, 0xbb, 0x43, 0xea, 0xbd, 0xa8, 0x8f, 0xb4, 0x0a,
+	0x68, 0x3e, 0x75, 0xf8, 0xb0, 0x5b, 0x39, 0xf0, 0xb0, 0x8b, 0xfa, 0x1c, 0x6a, 0x8e, 0xd6, 0x5a,
+	0x92, 0x0d, 0xf6, 0xc2, 0x5a, 0x4f, 0x8f, 0xb9, 0x5d, 0xe2, 0x82, 0x09, 0x1e, 0x82, 0xad, 0x9e,
+	0x18, 0xaa, 0x9f, 0xa1, 0xcf, 0xb7, 0x0e, 0xe1, 0x83, 0x67, 0x45, 0x04, 0xd0, 0xaa, 0xd1, 0x2b,
+	0x84, 0xdd, 0x16, 0x81, 0x98, 0x3c, 0xcc, 0x38, 0xdf, 0x3e, 0x47, 0xaf, 0x6f, 0x1e, 0xc2, 0x4b,
+	0x1c, 0x79, 0x98, 0x6b, 0xe8, 0x34, 0xdb, 0x33, 0x82, 0x2e, 0x23, 0x24, 0x4d, 0xe2, 0xb4, 0x85,
+	0xb3, 0xf6, 0x21, 0x3c, 0x35, 0x4f, 0x6f, 0x4c, 0x84, 0x15, 0x1e, 0xe4, 0x53, 0xf6, 0x8a, 0x54,
+	0xf0, 0x1a, 0x1e, 0x95, 0x0e, 0x3f, 0x63, 0x55, 0x3e, 0xee, 0x78, 0x92, 0xcc, 0x60, 0x3e, 0x9c,
+	0x83, 0x8f, 0x21, 0x61, 0x79, 0x63, 0x22, 0x44, 0x17, 0x9c, 0xac, 0xa7, 0x48, 0x15, 0x35, 0x62,
+	0xae, 0xbe, 0xca, 0x9f, 0xe6, 0x37, 0x26, 0x42, 0x5c, 0x2a, 0x86, 0xaa, 0x52, 0x89, 0x91, 0xfa,
+	0x1a, 0xa8, 0x6a, 0x4a, 0x25, 0xe6, 0xa9, 0xee, 0x17, 0xf8, 0xf4, 0x75, 0x10, 0x39, 0xba, 0x5f,
+	0xe0, 0x9b, 0x7e, 0x81, 0x4f, 0xdf, 0x00, 0x91, 0x6b, 0xf8, 0xe9, 0x2a, 0x31, 0x43, 0xdf, 0x04,
+	0x55, 0xc9, 0xf0, 0xe3, 0x3f, 0xfb, 0xb3, 0x22, 0x97, 0x1c, 0x88, 0x6f, 0x81, 0xae, 0xbe, 0x31,
+	0x11, 0xd6, 0x30, 0x5b, 0x4b, 0x5d, 0x51, 0x30, 0xa0, 0x26, 0xe7, 0xdb, 0x20, 0x9c, 0xda, 0x98,
+	0x08, 0xd1, 0x47, 0x8e, 0x4d, 0xd5, 0x01, 0x0e, 0xcd, 0x77, 0x40, 0x65, 0xab, 0x0e, 0x70, 0x5e,
+	0x16, 0x5c, 0x03, 0x9f, 0xbe, 0x0b, 0xb2, 0x46, 0xc1, 0x35, 0xf0, 0x0b, 0xae, 0x81, 0x4f, 0xdf,
+	0x03, 0xe1, 0xa4, 0xe9, 0xaa, 0x77, 0x2b, 0x66, 0xe4, 0xfb, 0x20, 0xb3, 0x54, 0xb7, 0x62, 0x3c,
+	0xe6, 0x3b, 0x87, 0xc3, 0xf1, 0x03, 0x50, 0x55, 0xf2, 0x9d, 0xc3, 0xb9, 0xa8, 0x3a, 0xc0, 0xa9,
+	0xf8, 0x21, 0x88, 0xaa, 0xaa, 0x03, 0x1c, 0x88, 0x3f, 0x95, 0x75, 0xc9, 0xfb, 0xca, 0x47, 0xa5,
+	0x23, 0x3d, 0xa6, 0xab, 0x46, 0x24, 0x4a, 0x9b, 0xe2, 0x00, 0xe3, 0x5d, 0xe5, 0xe3, 0x12, 0x7f,
+	0x46, 0x6f, 0x1e, 0xf8, 0x19, 0x1d, 0x96, 0xf2, 0x8b, 0x8a, 0xaa, 0x17, 0xef, 0x29, 0x5f, 0x96,
+	0x3d, 0x65, 0x77, 0xd3, 0xad, 0x65, 0xfa, 0xa0, 0xcc, 0xcf, 0xb1, 0x25, 0x8e, 0xfa, 0xb5, 0xbb,
+	0xe9, 0xb2, 0x29, 0x69, 0xd2, 0xff, 0x94, 0xf9, 0xd1, 0xd3, 0x24, 0xcd, 0x13, 0x01, 0xa9, 0x19,
+	0x6f, 0x01, 0x8c, 0xd7, 0x1a, 0x58, 0xf1, 0x3c, 0x7f, 0xfd, 0xa1, 0xde, 0x0e, 0x70, 0x19, 0xac,
+	0x33, 0x1e, 0x65, 0x8c, 0x67, 0x33, 0x5c, 0x77, 0x97, 0x3f, 0xc3, 0xa9, 0x47, 0x1c, 0x5c, 0x77,
+	0x11, 0xd6, 0x69, 0xb7, 0x2f, 0xe3, 0x46, 0x89, 0xeb, 0x1e, 0xe3, 0xd5, 0x53, 0x5d, 0xcb, 0x70,
+	0xe1, 0x77, 0x88, 0x3b, 0x3e, 0x23, 0xdd, 0x06, 0x71, 0x6e, 0xc5, 0x7b, 0xfc, 0x6d, 0x60, 0x39,
+	0x84, 0x3f, 0xdd, 0x63, 0xa4, 0x7c, 0x27, 0xea, 0x8e, 0x62, 0xfe, 0xf2, 0xcf, 0x09, 0xf1, 0xc3,
+	0x8a, 0x7d, 0xc9, 0x3a, 0x91, 0x91, 0xe3, 0xfb, 0x4e, 0x3f, 0x3d, 0x49, 0x05, 0x93, 0xac, 0xe9,
+	0x49, 0x8e, 0x70, 0x65, 0xd5, 0x5c, 0x53, 0x32, 0xbf, 0xcf, 0x1c, 0xd4, 0x3d, 0x27, 0xd1, 0x73,
+	0x55, 0xf7, 0x3c, 0xec, 0xd3, 0x9c, 0x66, 0x78, 0x99, 0x90, 0xfc, 0xcc, 0xf0, 0xf7, 0x69, 0xfc,
+	0x08, 0xf0, 0xbd, 0xdd, 0xe2, 0x2f, 0x60, 0xe9, 0x27, 0x1c, 0x92, 0xb0, 0x9e, 0x2a, 0x1d, 0xcf,
+	0x7a, 0xa2, 0x42, 0xa6, 0x44, 0xd6, 0x93, 0x5f, 0x22, 0x25, 0x3e, 0x2d, 0xa7, 0x49, 0xe9, 0xfa,
+	0x5a, 0x78, 0xb5, 0x31, 0xe1, 0x4e, 0x11, 0xb8, 0xaa, 0x36, 0xac, 0xd5, 0x9a, 0x1a, 0x07, 0xb0,
+	0x68, 0x75, 0x86, 0x54, 0xd4, 0x21, 0x5b, 0xfd, 0xee, 0xf5, 0x6f, 0xb7, 0x3b, 0xd9, 0xcd, 0xd1,
+	0xf6, 0xe2, 0x4e, 0xda, 0x5b, 0x6a, 0xa7, 0xdd, 0x28, 0x69, 0x2f, 0xf1, 0xca, 0xb7, 0x47, 0xad,
+	0xa5, 0x3b, 0xcd, 0xa5, 0x9d, 0xde, 0x2e, 0x7e, 0xde, 0x59, 0x68, 0xc7, 0xc9, 0x42, 0x3b, 0x5d,
+	0xca, 0xe2, 0x61, 0xb6, 0x1b, 0x65, 0x11, 0x86, 0x9b, 0x5f, 0x04, 0x00, 0x00, 0xff, 0xff, 0xc5,
+	0xb1, 0xdf, 0x80, 0x2c, 0x16, 0x00, 0x00,
 }
diff --git a/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go b/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go
index 1daa2eb..0f8b3ee 100644
--- a/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go
@@ -146,7 +146,7 @@
 func init() { proto.RegisterFile("proto2/nested_messages.proto", fileDescriptor_7417ee157699d191) }
 
 var fileDescriptor_7417ee157699d191 = []byte{
-	// 184 bytes of a gzipped FileDescriptorProto
+	// 190 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0x28, 0xca, 0x2f,
 	0xc9, 0x37, 0xd2, 0xcf, 0x4b, 0x2d, 0x2e, 0x49, 0x4d, 0x89, 0xcf, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c,
 	0x4f, 0x2d, 0xd6, 0x03, 0x0b, 0x0b, 0x89, 0xa6, 0xe7, 0x83, 0x19, 0x10, 0x6e, 0x32, 0x84, 0x32,
@@ -154,9 +154,9 @@
 	0x63, 0x24, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6d, 0xa4, 0xa2, 0x87, 0x55, 0xb9, 0x1e, 0x44, 0x29,
 	0x84, 0x32, 0x0a, 0x62, 0xca, 0x31, 0x12, 0xb2, 0xe6, 0x62, 0xca, 0x31, 0x96, 0x60, 0x02, 0xeb,
 	0xd2, 0x26, 0x46, 0x17, 0x84, 0x32, 0x0e, 0x62, 0xca, 0x31, 0x96, 0xf2, 0x87, 0x5a, 0x0e, 0x33,
-	0x86, 0x91, 0x3c, 0x63, 0x38, 0xa0, 0xc6, 0x18, 0x3b, 0x59, 0x47, 0x59, 0xa6, 0xe7, 0xe7, 0xa7,
-	0xe7, 0xa4, 0xea, 0xa5, 0xe7, 0xe7, 0x24, 0xe6, 0xa5, 0xeb, 0xe5, 0x17, 0xa5, 0xeb, 0x83, 0xb5,
-	0xeb, 0x27, 0xe7, 0xa6, 0x40, 0x58, 0xc9, 0xba, 0xe9, 0xa9, 0x79, 0xba, 0xe9, 0xf9, 0xfa, 0x25,
-	0xa9, 0xc5, 0x25, 0x29, 0x89, 0x25, 0x89, 0x10, 0x61, 0x23, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff,
-	0x47, 0x0d, 0xa3, 0x19, 0x41, 0x01, 0x00, 0x00,
+	0x86, 0x91, 0x3c, 0x63, 0x38, 0xa0, 0xc6, 0x18, 0x3b, 0x39, 0x46, 0xd9, 0xa7, 0x67, 0x96, 0x64,
+	0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, 0xe7, 0xe7, 0x24, 0xe6, 0xa5, 0xeb, 0x83, 0xb5,
+	0x27, 0x95, 0xa6, 0xe9, 0x97, 0x19, 0xe9, 0x27, 0xe7, 0xa6, 0x40, 0xf8, 0xc9, 0xba, 0xe9, 0xa9,
+	0x79, 0xba, 0xe9, 0xf9, 0xfa, 0x25, 0xa9, 0xc5, 0x25, 0x29, 0x89, 0x25, 0x89, 0x10, 0x61, 0x23,
+	0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x11, 0x21, 0xb0, 0x06, 0x47, 0x01, 0x00, 0x00,
 }
diff --git a/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go b/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go
index a912199..1cb5191 100644
--- a/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go
@@ -74,15 +74,15 @@
 func init() { proto.RegisterFile("proto2/proto2.proto", fileDescriptor_d756bbe8817c03c1) }
 
 var fileDescriptor_d756bbe8817c03c1 = []byte{
-	// 146 bytes of a gzipped FileDescriptorProto
+	// 152 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2e, 0x28, 0xca, 0x2f,
 	0xc9, 0x37, 0xd2, 0x87, 0x50, 0x7a, 0x60, 0x4a, 0x48, 0x34, 0x3d, 0x1f, 0xcc, 0x80, 0x70, 0x93,
 	0x21, 0x94, 0x91, 0x92, 0x27, 0x17, 0xbb, 0x6f, 0x6a, 0x71, 0x71, 0x62, 0x7a, 0xaa, 0x90, 0x00,
 	0x17, 0x73, 0xa6, 0xb1, 0x91, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x6b, 0x10, 0x88, 0x29, 0xa4, 0xc3,
 	0xc5, 0x98, 0x2b, 0xc1, 0xa4, 0xc0, 0xa8, 0xc1, 0x6d, 0x24, 0xa7, 0x87, 0x55, 0xbf, 0x1e, 0x54,
-	0x73, 0x10, 0x63, 0xae, 0x93, 0x75, 0x94, 0x65, 0x7a, 0x7e, 0x7e, 0x7a, 0x4e, 0xaa, 0x5e, 0x7a,
-	0x7e, 0x4e, 0x62, 0x5e, 0xba, 0x5e, 0x7e, 0x51, 0x3a, 0xc4, 0x0d, 0xfa, 0xc9, 0xb9, 0x29, 0x10,
-	0x56, 0xb2, 0x6e, 0x7a, 0x6a, 0x9e, 0x6e, 0x7a, 0xbe, 0x7e, 0x49, 0x6a, 0x71, 0x49, 0x4a, 0x62,
-	0x49, 0x22, 0xd4, 0x91, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x68, 0x66, 0x37, 0xb4, 0x00,
-	0x00, 0x00,
+	0x73, 0x10, 0x63, 0xae, 0x93, 0x63, 0x94, 0x7d, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72,
+	0x7e, 0xae, 0x7e, 0x7a, 0x7e, 0x4e, 0x62, 0x5e, 0x3a, 0xc4, 0x0d, 0x49, 0xa5, 0x69, 0xfa, 0x65,
+	0x46, 0xfa, 0xc9, 0xb9, 0x29, 0x10, 0x7e, 0xb2, 0x6e, 0x7a, 0x6a, 0x9e, 0x6e, 0x7a, 0xbe, 0x7e,
+	0x49, 0x6a, 0x71, 0x49, 0x4a, 0x62, 0x49, 0x22, 0xd4, 0xa9, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0x85, 0x42, 0x0d, 0x5f, 0xba, 0x00, 0x00, 0x00,
 }
diff --git a/cmd/protoc-gen-go/testdata/proto3/enum.pb.go b/cmd/protoc-gen-go/testdata/proto3/enum.pb.go
index bf9dfbd..511e8e0 100644
--- a/cmd/protoc-gen-go/testdata/proto3/enum.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto3/enum.pb.go
@@ -55,14 +55,14 @@
 func init() { proto.RegisterFile("proto3/enum.proto", fileDescriptor_b4b9b1e8d161a9a6) }
 
 var fileDescriptor_b4b9b1e8d161a9a6 = []byte{
-	// 138 bytes of a gzipped FileDescriptorProto
+	// 144 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2c, 0x28, 0xca, 0x2f,
 	0xc9, 0x37, 0xd6, 0x4f, 0xcd, 0x2b, 0xcd, 0xd5, 0x03, 0xb3, 0x85, 0x44, 0xd3, 0xf3, 0xc1, 0x0c,
 	0x08, 0x37, 0x19, 0x42, 0x19, 0x6b, 0x29, 0x71, 0xb1, 0xb8, 0xe6, 0x95, 0xe6, 0x0a, 0x71, 0x70,
 	0xb1, 0x44, 0xb9, 0x06, 0xf9, 0x0b, 0x30, 0x08, 0xb1, 0x73, 0x31, 0xfb, 0xfb, 0xb9, 0x0a, 0x30,
-	0x82, 0x18, 0x21, 0xe1, 0xfe, 0x02, 0x4c, 0x4e, 0xd6, 0x51, 0x96, 0xe9, 0xf9, 0xf9, 0xe9, 0x39,
-	0xa9, 0x7a, 0xe9, 0xf9, 0x39, 0x89, 0x79, 0xe9, 0x7a, 0xf9, 0x45, 0xe9, 0xfa, 0x60, 0xfd, 0xfa,
-	0xc9, 0xb9, 0x29, 0x10, 0x56, 0xb2, 0x6e, 0x7a, 0x6a, 0x9e, 0x6e, 0x7a, 0xbe, 0x7e, 0x49, 0x6a,
-	0x71, 0x49, 0x4a, 0x62, 0x49, 0x22, 0x44, 0xd8, 0x38, 0x89, 0x0d, 0x42, 0x03, 0x02, 0x00, 0x00,
-	0xff, 0xff, 0x02, 0x01, 0x6a, 0x95, 0x93, 0x00, 0x00, 0x00,
+	0x82, 0x18, 0x21, 0xe1, 0xfe, 0x02, 0x4c, 0x4e, 0x8e, 0x51, 0xf6, 0xe9, 0x99, 0x25, 0x19, 0xa5,
+	0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xe9, 0xf9, 0x39, 0x89, 0x79, 0xe9, 0xfa, 0x60, 0xfd, 0x49,
+	0xa5, 0x69, 0xfa, 0x65, 0x46, 0xfa, 0xc9, 0xb9, 0x29, 0x10, 0x7e, 0xb2, 0x6e, 0x7a, 0x6a, 0x9e,
+	0x6e, 0x7a, 0xbe, 0x7e, 0x49, 0x6a, 0x71, 0x49, 0x4a, 0x62, 0x49, 0x22, 0x44, 0xd8, 0x38, 0x89,
+	0x0d, 0x42, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x96, 0x4a, 0x7d, 0xc7, 0x99, 0x00, 0x00, 0x00,
 }
diff --git a/cmd/protoc-gen-go/testdata/proto3/fields.pb.go b/cmd/protoc-gen-go/testdata/proto3/fields.pb.go
index b09aafb..1e45d9f 100644
--- a/cmd/protoc-gen-go/testdata/proto3/fields.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto3/fields.pb.go
@@ -401,68 +401,68 @@
 var xxx_messageInfo_FieldTestMessage_Message proto.InternalMessageInfo
 
 func init() {
+	proto.RegisterEnum("goproto.protoc.proto3.FieldTestMessage_Enum", FieldTestMessage_Enum_name, FieldTestMessage_Enum_value)
 	proto.RegisterType((*FieldTestMessage)(nil), "goproto.protoc.proto3.FieldTestMessage")
 	proto.RegisterMapType((map[uint64]FieldTestMessage_Enum)(nil), "goproto.protoc.proto3.FieldTestMessage.MapFixed64EnumEntry")
 	proto.RegisterMapType((map[int32]int64)(nil), "goproto.protoc.proto3.FieldTestMessage.MapInt32Int64Entry")
 	proto.RegisterMapType((map[string]*FieldTestMessage_Message)(nil), "goproto.protoc.proto3.FieldTestMessage.MapStringMessageEntry")
 	proto.RegisterType((*FieldTestMessage_Message)(nil), "goproto.protoc.proto3.FieldTestMessage.Message")
-	proto.RegisterEnum("goproto.protoc.proto3.FieldTestMessage_Enum", FieldTestMessage_Enum_name, FieldTestMessage_Enum_value)
 }
 
 func init() { proto.RegisterFile("proto3/fields.proto", fileDescriptor_f1e3ea068187307c) }
 
 var fileDescriptor_f1e3ea068187307c = []byte{
-	// 826 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x95, 0xdb, 0x6f, 0xda, 0x48,
-	0x14, 0xc6, 0x77, 0xb8, 0x86, 0x09, 0x17, 0x33, 0xd9, 0x48, 0xa3, 0x3c, 0x8d, 0xb2, 0xb7, 0xd9,
-	0xdd, 0x04, 0x24, 0xb0, 0xac, 0xdd, 0x44, 0x2b, 0xad, 0xd0, 0x12, 0x69, 0x1f, 0xaa, 0xaa, 0x6e,
-	0xfb, 0x92, 0x3e, 0x44, 0x06, 0x06, 0x0b, 0xd5, 0xf6, 0x20, 0x30, 0x55, 0xf3, 0x27, 0xf6, 0x9e,
-	0xde, 0xdb, 0xff, 0xa3, 0xed, 0x73, 0x35, 0x9e, 0xb1, 0x3d, 0x36, 0x3c, 0x84, 0x3c, 0xd9, 0x3e,
-	0x7c, 0x7c, 0xbf, 0x39, 0xc7, 0xe7, 0x03, 0xb8, 0x37, 0x5f, 0xf0, 0x90, 0xf7, 0xbb, 0xd3, 0x19,
-	0xf3, 0x26, 0xcb, 0x4e, 0xf4, 0x84, 0xf6, 0x5d, 0x1e, 0xdd, 0xc8, 0xc7, 0xb1, 0xbc, 0xf4, 0x0f,
-	0xaf, 0xda, 0xd0, 0x38, 0x13, 0xba, 0x7b, 0x6c, 0x19, 0xde, 0x62, 0xcb, 0xa5, 0xe3, 0x32, 0xf4,
-	0x13, 0x6c, 0xf0, 0x79, 0x38, 0xe3, 0x81, 0xe3, 0x5d, 0x8c, 0x38, 0xf7, 0x30, 0x20, 0x80, 0xd6,
-	0xec, 0x7a, 0x5c, 0x1c, 0x70, 0xee, 0xa1, 0x3b, 0x9a, 0x88, 0x05, 0x2b, 0x1f, 0x17, 0x08, 0xa0,
-	0xcd, 0xde, 0x51, 0x67, 0x23, 0xa8, 0x93, 0x87, 0x74, 0x86, 0xc1, 0xca, 0x4f, 0x2d, 0xc5, 0x13,
-	0xfa, 0x05, 0x36, 0x13, 0xcb, 0x59, 0x10, 0xf6, 0x7b, 0xb8, 0x48, 0x00, 0x2d, 0xdb, 0x09, 0xe8,
-	0x7f, 0x51, 0x44, 0xbf, 0xc1, 0x56, 0x22, 0x5b, 0x4a, 0x5d, 0x89, 0x00, 0xda, 0xb6, 0x93, 0x6f,
-	0xdf, 0x9d, 0xad, 0x09, 0x57, 0x52, 0x58, 0x26, 0x80, 0x36, 0x52, 0xe1, 0x7d, 0x29, 0xcc, 0x81,
-	0x2d, 0x13, 0x57, 0x08, 0xa0, 0xc5, 0x0c, 0xd8, 0x32, 0xd7, 0xc0, 0x96, 0x89, 0xab, 0x04, 0x50,
-	0x94, 0x05, 0xe7, 0x84, 0x2b, 0x29, 0xdc, 0x21, 0x80, 0x96, 0xb2, 0x60, 0xcb, 0x44, 0x7f, 0xc2,
-	0x76, 0xea, 0x38, 0x9d, 0x3d, 0x66, 0x93, 0x7e, 0x0f, 0xd7, 0x08, 0xa0, 0x2d, 0xdb, 0x48, 0x3c,
-	0x55, 0x1d, 0xfd, 0x0e, 0x93, 0xda, 0x45, 0xac, 0x85, 0x04, 0xd0, 0xaa, 0x9d, 0xd0, 0xce, 0x94,
-	0x54, 0x6f, 0x68, 0xea, 0x71, 0x27, 0xc4, 0xbb, 0x04, 0xd0, 0x42, 0xda, 0xd0, 0x99, 0x28, 0x6e,
-	0xc0, 0x5b, 0x26, 0xae, 0x13, 0x40, 0x8d, 0x3c, 0xde, 0x32, 0xd7, 0xf1, 0x96, 0x89, 0x1b, 0x04,
-	0xd0, 0x4a, 0x0e, 0x9f, 0xeb, 0x7f, 0xc2, 0x57, 0x23, 0x8f, 0xe1, 0x26, 0x01, 0x14, 0xa4, 0xfd,
-	0xff, 0x17, 0x55, 0xb3, 0x13, 0x0d, 0x17, 0xb3, 0xc0, 0xc5, 0xad, 0x68, 0xd7, 0xd2, 0x89, 0x46,
-	0xd5, 0x4c, 0x43, 0xa3, 0xcb, 0x90, 0x2d, 0xb1, 0x41, 0x00, 0xad, 0xa7, 0x0d, 0x0d, 0x44, 0x11,
-	0x9d, 0x6b, 0x67, 0x54, 0x8b, 0x86, 0xdb, 0x04, 0xd0, 0xdd, 0x5e, 0xf7, 0xba, 0x7b, 0xa9, 0xae,
-	0x69, 0x53, 0x71, 0x2a, 0x7e, 0x86, 0x8d, 0x05, 0x9b, 0x33, 0x27, 0x64, 0x13, 0x99, 0x8a, 0x27,
-	0x80, 0x14, 0xe9, 0x8e, 0x5d, 0x8f, 0xab, 0x51, 0x2c, 0x6c, 0x4d, 0x15, 0xc5, 0xe2, 0xa9, 0x50,
-	0x6d, 0x9d, 0x8b, 0xd8, 0x23, 0xca, 0xc5, 0xaf, 0xb0, 0x99, 0x78, 0xca, 0x35, 0x7e, 0x26, 0x4c,
-	0xcb, 0x76, 0x82, 0x92, 0xc1, 0xa0, 0xb0, 0x95, 0xe8, 0x54, 0x30, 0x9e, 0x0b, 0x61, 0xdb, 0x4e,
-	0xbe, 0xaf, 0x92, 0xa1, 0x2b, 0x55, 0x32, 0x5e, 0x08, 0x65, 0x23, 0x55, 0xaa, 0x68, 0xe4, 0xd8,
-	0x96, 0x89, 0x5f, 0x0a, 0x61, 0x31, 0xc3, 0xb6, 0xcc, 0x35, 0xb6, 0x65, 0xe2, 0x57, 0x42, 0x88,
-	0xb2, 0xec, 0x9c, 0x52, 0x85, 0xe3, 0x4a, 0x28, 0x4b, 0x59, 0xb6, 0x65, 0xa2, 0x23, 0xd8, 0x4e,
-	0x3d, 0xe3, 0x8d, 0x7f, 0x2d, 0xb4, 0x2d, 0xdb, 0x48, 0x5c, 0xe3, 0x78, 0xfc, 0x01, 0x93, 0x5a,
-	0x12, 0x8f, 0x37, 0x42, 0x5c, 0xb5, 0x13, 0x60, 0x9c, 0x0f, 0xbd, 0x2b, 0x99, 0x8f, 0xb7, 0x42,
-	0x59, 0x48, 0xbb, 0x92, 0x01, 0x59, 0x3f, 0x81, 0x65, 0xe2, 0x77, 0x42, 0x6a, 0xe4, 0x4f, 0x60,
-	0x99, 0xeb, 0x27, 0xb0, 0x4c, 0xfc, 0x5e, 0x88, 0x2b, 0xb9, 0x13, 0xe4, 0xa6, 0xa0, 0x22, 0xf2,
-	0x41, 0x48, 0x41, 0x3a, 0x05, 0x95, 0x91, 0xcc, 0x64, 0x65, 0x46, 0x3e, 0x0a, 0x65, 0x4d, 0x9b,
-	0xac, 0x0c, 0x89, 0xde, 0x95, 0x0c, 0xc9, 0x27, 0x21, 0xac, 0xa7, 0x5d, 0xc9, 0x94, 0x3c, 0xd0,
-	0xce, 0x19, 0xa7, 0xe4, 0xb3, 0x50, 0xde, 0x24, 0x26, 0xb1, 0x53, 0x1c, 0x93, 0x31, 0x6c, 0xf9,
-	0xce, 0x5c, 0xee, 0xa9, 0xda, 0x98, 0x2f, 0xc5, 0xc8, 0xfb, 0xe4, 0xda, 0xde, 0xce, 0x3c, 0x5a,
-	0xe8, 0x68, 0xb3, 0x86, 0x41, 0xb8, 0xb8, 0xb4, 0x1b, 0xbe, 0x5e, 0x43, 0x1e, 0x44, 0x02, 0x22,
-	0xc7, 0x71, 0xe1, 0xab, 0x1e, 0xbe, 0x4a, 0xce, 0x3f, 0x5b, 0x70, 0xe4, 0xe4, 0x54, 0x41, 0xa2,
-	0x0c, 0x3f, 0x57, 0x46, 0x53, 0x28, 0x6a, 0xf1, 0x2b, 0x95, 0xb1, 0xfe, 0x26, 0x59, 0xa7, 0x5b,
-	0xb0, 0xd4, 0xab, 0x17, 0x91, 0x96, 0xa4, 0xa6, 0x9f, 0x29, 0x1e, 0xfc, 0x0b, 0xd1, 0x7a, 0xeb,
-	0xc8, 0x80, 0xc5, 0x87, 0xec, 0x32, 0xfa, 0x0f, 0x2e, 0xdb, 0xe2, 0x16, 0xfd, 0x08, 0xcb, 0x8f,
-	0x1c, 0x6f, 0xc5, 0xa2, 0xbf, 0xdc, 0xa2, 0x2d, 0x1f, 0x4e, 0x0a, 0x7f, 0x81, 0x83, 0x10, 0xee,
-	0x6f, 0x6c, 0x4a, 0x37, 0xa9, 0x49, 0x93, 0xa1, 0x6e, 0x72, 0x83, 0x17, 0xaf, 0x51, 0x39, 0xdc,
-	0xdb, 0xd0, 0x9e, 0xce, 0xac, 0x48, 0xe6, 0x40, 0x67, 0x6e, 0xfb, 0x9b, 0xa8, 0x01, 0x6b, 0xb0,
-	0xaa, 0x3e, 0x3a, 0x34, 0x60, 0x29, 0xfa, 0x8d, 0xdc, 0x81, 0xa5, 0xf3, 0xa1, 0x7d, 0xdb, 0xf8,
-	0x61, 0x70, 0x7a, 0xfe, 0xb7, 0xcb, 0xb9, 0xeb, 0xb1, 0x8e, 0xcb, 0x3d, 0x27, 0x70, 0x3b, 0x7c,
-	0xe1, 0x76, 0x23, 0xe7, 0xee, 0xd8, 0x9f, 0xc8, 0xbb, 0xf1, 0xb1, 0xcb, 0x82, 0x63, 0x97, 0x77,
-	0x43, 0xb6, 0x0c, 0x27, 0x4e, 0xe8, 0xc8, 0x72, 0x7f, 0x54, 0x91, 0xd7, 0xef, 0x01, 0x00, 0x00,
-	0xff, 0xff, 0xc1, 0x70, 0x3f, 0x3d, 0x44, 0x09, 0x00, 0x00,
+	// 832 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x95, 0xc9, 0x6f, 0xdb, 0x38,
+	0x14, 0xc6, 0x87, 0x5e, 0x63, 0xc6, 0x8b, 0xcc, 0x4c, 0x00, 0x22, 0x27, 0x22, 0xb3, 0x71, 0x66,
+	0x12, 0x1b, 0xb0, 0x05, 0x61, 0x90, 0x41, 0xd1, 0xd6, 0xa8, 0x03, 0xf4, 0x50, 0x14, 0x55, 0xdb,
+	0x4b, 0x7a, 0x08, 0x64, 0x5b, 0x56, 0x8d, 0x6a, 0x31, 0x6c, 0x29, 0x68, 0xfe, 0xc4, 0xee, 0xe9,
+	0xde, 0xfe, 0x1f, 0x6d, 0xcf, 0x05, 0x45, 0x8a, 0xa2, 0x64, 0x1f, 0xe2, 0x9c, 0x64, 0x3e, 0x7f,
+	0xfa, 0x7e, 0x7c, 0xd4, 0xfb, 0x24, 0xb8, 0x33, 0x5f, 0x04, 0x61, 0xd0, 0xef, 0x4e, 0x67, 0xb6,
+	0x3b, 0x59, 0x76, 0xe2, 0x15, 0xda, 0x75, 0x82, 0xf8, 0x07, 0x5f, 0x8e, 0xf9, 0xa5, 0xbf, 0x7f,
+	0xd1, 0x86, 0xda, 0x31, 0xd3, 0x3d, 0xb0, 0x97, 0xe1, 0x1d, 0x7b, 0xb9, 0xb4, 0x1c, 0x1b, 0xfd,
+	0x06, 0x1b, 0xc1, 0x3c, 0x9c, 0x05, 0xbe, 0xe5, 0x9e, 0x8e, 0x82, 0xc0, 0xc5, 0x80, 0x00, 0x5a,
+	0x33, 0xeb, 0x49, 0x71, 0x10, 0x04, 0x2e, 0xba, 0xa7, 0x88, 0x6c, 0x3f, 0xf2, 0x70, 0x81, 0x00,
+	0xda, 0xec, 0x1d, 0x74, 0xd6, 0x82, 0x3a, 0x79, 0x48, 0x67, 0xe8, 0x47, 0x5e, 0x6a, 0xc9, 0x56,
+	0xe8, 0x0f, 0xd8, 0x94, 0x96, 0x33, 0x3f, 0xec, 0xf7, 0x70, 0x91, 0x00, 0x5a, 0x36, 0x25, 0xe8,
+	0x36, 0x2b, 0xa2, 0xbf, 0x60, 0x4b, 0xca, 0x96, 0x5c, 0x57, 0x22, 0x80, 0xb6, 0x4d, 0x79, 0xf7,
+	0xfd, 0xd9, 0x8a, 0x30, 0xe2, 0xc2, 0x32, 0x01, 0xb4, 0x91, 0x0a, 0x1f, 0x72, 0x61, 0x0e, 0x6c,
+	0xe8, 0xb8, 0x42, 0x00, 0x2d, 0x66, 0xc0, 0x86, 0xbe, 0x02, 0x36, 0x74, 0x5c, 0x25, 0x80, 0xa2,
+	0x2c, 0x38, 0x27, 0x8c, 0xb8, 0x70, 0x8b, 0x00, 0x5a, 0xca, 0x82, 0x0d, 0x1d, 0xfd, 0x0b, 0xdb,
+	0xa9, 0xe3, 0x74, 0xf6, 0xd4, 0x9e, 0xf4, 0x7b, 0xb8, 0x46, 0x00, 0x6d, 0x99, 0x9a, 0xf4, 0x14,
+	0x75, 0xf4, 0x37, 0x94, 0xb5, 0xd3, 0x44, 0x0b, 0x09, 0xa0, 0x55, 0x53, 0xd2, 0x8e, 0x85, 0x54,
+	0x6d, 0x68, 0xea, 0x06, 0x56, 0x88, 0xb7, 0x09, 0xa0, 0x85, 0xb4, 0xa1, 0x63, 0x56, 0x5c, 0x83,
+	0x37, 0x74, 0x5c, 0x27, 0x80, 0x6a, 0x79, 0xbc, 0xa1, 0xaf, 0xe2, 0x0d, 0x1d, 0x37, 0x08, 0xa0,
+	0x95, 0x1c, 0x3e, 0xd7, 0xff, 0x24, 0x88, 0x46, 0xae, 0x8d, 0x9b, 0x04, 0x50, 0x90, 0xf6, 0x7f,
+	0x2b, 0xae, 0x66, 0x4f, 0x34, 0x5c, 0xcc, 0x7c, 0x07, 0xb7, 0xe2, 0x59, 0x4b, 0x4f, 0x34, 0xae,
+	0x66, 0x1a, 0x1a, 0x9d, 0x87, 0xf6, 0x12, 0x6b, 0x04, 0xd0, 0x7a, 0xda, 0xd0, 0x80, 0x15, 0xd1,
+	0x89, 0xb2, 0x47, 0x31, 0x68, 0xb8, 0x4d, 0x00, 0xdd, 0xee, 0x75, 0x2f, 0x3b, 0x97, 0xe2, 0x9a,
+	0x36, 0x95, 0xa4, 0xe2, 0x77, 0xd8, 0x58, 0xd8, 0x73, 0xdb, 0x0a, 0xed, 0x09, 0x4f, 0xc5, 0x33,
+	0x40, 0x8a, 0x74, 0xcb, 0xac, 0x27, 0xd5, 0x38, 0x16, 0xa6, 0xa2, 0x8a, 0x63, 0xf1, 0x9c, 0xa9,
+	0x36, 0xce, 0x45, 0xe2, 0x11, 0xe7, 0xe2, 0x4f, 0xd8, 0x94, 0x9e, 0x7c, 0x8c, 0x5f, 0x30, 0xd3,
+	0xb2, 0x29, 0x51, 0x3c, 0x18, 0x14, 0xb6, 0xa4, 0x4e, 0x04, 0xe3, 0x25, 0x13, 0xb6, 0x4d, 0x79,
+	0xbf, 0x48, 0x86, 0xaa, 0x14, 0xc9, 0x78, 0xc5, 0x94, 0x8d, 0x54, 0x29, 0xa2, 0x91, 0x63, 0x1b,
+	0x3a, 0x7e, 0xcd, 0x84, 0xc5, 0x0c, 0xdb, 0xd0, 0x57, 0xd8, 0x86, 0x8e, 0xdf, 0x30, 0x21, 0xca,
+	0xb2, 0x73, 0x4a, 0x11, 0x8e, 0x0b, 0xa6, 0x2c, 0x65, 0xd9, 0x86, 0x8e, 0x0e, 0x60, 0x3b, 0xf5,
+	0x4c, 0x26, 0xfe, 0x2d, 0xd3, 0xb6, 0x4c, 0x4d, 0xba, 0x26, 0xf1, 0xf8, 0x07, 0xca, 0x9a, 0x8c,
+	0xc7, 0x3b, 0x26, 0xae, 0x9a, 0x12, 0x98, 0xe4, 0x43, 0xed, 0x8a, 0xe7, 0xe3, 0x3d, 0x53, 0x16,
+	0xd2, 0xae, 0x78, 0x40, 0x56, 0x77, 0x60, 0xe8, 0xf8, 0x03, 0x93, 0x6a, 0xf9, 0x1d, 0x18, 0xfa,
+	0xea, 0x0e, 0x0c, 0x1d, 0x7f, 0x64, 0xe2, 0x4a, 0x6e, 0x07, 0xb9, 0x53, 0x10, 0x11, 0xf9, 0xc4,
+	0xa4, 0x20, 0x3d, 0x05, 0x91, 0x91, 0xcc, 0xc9, 0xf2, 0x8c, 0x7c, 0x66, 0xca, 0x9a, 0x72, 0xb2,
+	0x3c, 0x24, 0x6a, 0x57, 0x3c, 0x24, 0x5f, 0x98, 0xb0, 0x9e, 0x76, 0xc5, 0x53, 0xf2, 0x48, 0xd9,
+	0x67, 0x92, 0x92, 0xaf, 0x4c, 0x79, 0x95, 0x98, 0x24, 0x4e, 0x49, 0x4c, 0xc6, 0xb0, 0xe5, 0x59,
+	0x73, 0x3e, 0xa7, 0x62, 0x62, 0xbe, 0x15, 0x63, 0xef, 0xa3, 0x4b, 0x7b, 0x5b, 0xf3, 0x78, 0xa0,
+	0xe3, 0xc9, 0x1a, 0xfa, 0xe1, 0xe2, 0xdc, 0x6c, 0x78, 0x6a, 0x0d, 0xb9, 0x10, 0x31, 0x08, 0x3f,
+	0x8e, 0x53, 0x4f, 0xf4, 0xf0, 0x9d, 0x73, 0xae, 0x6d, 0xc0, 0xe1, 0x27, 0x27, 0x0a, 0x1c, 0xa5,
+	0x79, 0xb9, 0x32, 0x9a, 0x42, 0x56, 0x4b, 0x1e, 0x29, 0x8f, 0xf5, 0x0f, 0xce, 0xfa, 0x7f, 0x03,
+	0x96, 0x78, 0xf4, 0x2c, 0xd2, 0x9c, 0xd4, 0xf4, 0x32, 0xc5, 0xbd, 0x1b, 0x10, 0xad, 0xb6, 0x8e,
+	0x34, 0x58, 0x7c, 0x62, 0x9f, 0xc7, 0xdf, 0xe0, 0xb2, 0xc9, 0x7e, 0xa2, 0x5f, 0x61, 0xf9, 0xcc,
+	0x72, 0x23, 0x3b, 0xfe, 0xe4, 0x16, 0x4d, 0xbe, 0x38, 0x2a, 0xfc, 0x07, 0xf6, 0x42, 0xb8, 0xbb,
+	0xb6, 0x29, 0xd5, 0xa4, 0xc6, 0x4d, 0x86, 0xaa, 0xc9, 0x15, 0x1e, 0xbc, 0x42, 0x0d, 0xe0, 0xce,
+	0x9a, 0xf6, 0x54, 0x66, 0x85, 0x33, 0x07, 0x2a, 0x73, 0xd3, 0x77, 0xa2, 0x02, 0xac, 0xc1, 0xaa,
+	0xf8, 0x6b, 0x5f, 0x83, 0xa5, 0xf8, 0x1d, 0xb9, 0x05, 0x4b, 0x27, 0x43, 0xf3, 0xae, 0xf6, 0xcb,
+	0xe0, 0xe6, 0xc9, 0x75, 0x67, 0x16, 0x3e, 0x8e, 0x46, 0x9d, 0x71, 0xe0, 0x75, 0x9d, 0xc0, 0xb5,
+	0x7c, 0xa7, 0x1b, 0x3b, 0x8f, 0xa2, 0x69, 0xf7, 0xac, 0xd7, 0x1d, 0x7b, 0x13, 0xbe, 0x1e, 0x1f,
+	0x3a, 0xb6, 0x7f, 0xe8, 0x04, 0xdd, 0xd0, 0x5e, 0x86, 0x13, 0x2b, 0xb4, 0x78, 0xb9, 0x3f, 0xaa,
+	0xf0, 0xeb, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbb, 0x1c, 0x0b, 0xbf, 0x4a, 0x09, 0x00, 0x00,
 }