| Index: third_party/protobuf/Makefile.am
 | 
| diff --git a/third_party/protobuf/Makefile.am b/third_party/protobuf/Makefile.am
 | 
| index 3e9888166f81d55c9fd1c7410ebe46c6c7288f10..4763d9495aadca0870763035c1c87076d66c6777 100644
 | 
| --- a/third_party/protobuf/Makefile.am
 | 
| +++ b/third_party/protobuf/Makefile.am
 | 
| @@ -51,30 +51,30 @@ pkgconfig_DATA = protobuf.pc protobuf-lite.pc
 | 
|  csharp_EXTRA_DIST=                                                           \
 | 
|    csharp/.gitignore                                                          \
 | 
|    csharp/CHANGES.txt                                                         \
 | 
| +  csharp/Google.Protobuf.Tools.nuspec                                        \
 | 
|    csharp/README.md                                                           \
 | 
|    csharp/build_packages.bat                                                  \
 | 
| +  csharp/build_tools.sh                                                      \
 | 
|    csharp/buildall.sh                                                         \
 | 
|    csharp/generate_protos.sh                                                  \
 | 
|    csharp/keys/Google.Protobuf.public.snk                                     \
 | 
| +  csharp/keys/Google.Protobuf.snk                                            \
 | 
|    csharp/keys/README.md                                                      \
 | 
|    csharp/protos/unittest_issues.proto                                        \
 | 
|    csharp/src/AddressBook/AddPerson.cs                                        \
 | 
| -  csharp/src/AddressBook/AddressBook.csproj                                  \
 | 
|    csharp/src/AddressBook/Addressbook.cs                                      \
 | 
| +  csharp/src/AddressBook/AddressBook.xproj                                   \
 | 
|    csharp/src/AddressBook/ListPeople.cs                                       \
 | 
|    csharp/src/AddressBook/Program.cs                                          \
 | 
| -  csharp/src/AddressBook/Properties/AssemblyInfo.cs                          \
 | 
|    csharp/src/AddressBook/SampleUsage.cs                                      \
 | 
| -  csharp/src/AddressBook/app.config                                          \
 | 
| -  csharp/src/Google.Protobuf.Conformance/App.config                          \
 | 
| +  csharp/src/AddressBook/project.json                                        \
 | 
|    csharp/src/Google.Protobuf.Conformance/Conformance.cs                      \
 | 
| -  csharp/src/Google.Protobuf.Conformance/Google.Protobuf.Conformance.csproj  \
 | 
| +  csharp/src/Google.Protobuf.Conformance/Google.Protobuf.Conformance.xproj   \
 | 
|    csharp/src/Google.Protobuf.Conformance/Program.cs                          \
 | 
| -  csharp/src/Google.Protobuf.Conformance/Properties/AssemblyInfo.cs          \
 | 
| -  csharp/src/Google.Protobuf.JsonDump/Google.Protobuf.JsonDump.csproj        \
 | 
| +  csharp/src/Google.Protobuf.Conformance/project.json                        \
 | 
| +  csharp/src/Google.Protobuf.JsonDump/Google.Protobuf.JsonDump.xproj         \
 | 
|    csharp/src/Google.Protobuf.JsonDump/Program.cs                             \
 | 
| -  csharp/src/Google.Protobuf.JsonDump/Properties/AssemblyInfo.cs             \
 | 
| -  csharp/src/Google.Protobuf.JsonDump/app.config                             \
 | 
| +  csharp/src/Google.Protobuf.JsonDump/project.json                           \
 | 
|    csharp/src/Google.Protobuf.Test/ByteStringTest.cs                          \
 | 
|    csharp/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs              \
 | 
|    csharp/src/Google.Protobuf.Test/CodedInputStreamTest.cs                    \
 | 
| @@ -87,19 +87,18 @@ csharp_EXTRA_DIST=                                                           \
 | 
|    csharp/src/Google.Protobuf.Test/EqualityTester.cs                          \
 | 
|    csharp/src/Google.Protobuf.Test/FieldCodecTest.cs                          \
 | 
|    csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs                    \
 | 
| -  csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj                \
 | 
| +  csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.xproj                 \
 | 
|    csharp/src/Google.Protobuf.Test/IssuesTest.cs                              \
 | 
|    csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs                       \
 | 
|    csharp/src/Google.Protobuf.Test/JsonParserTest.cs                          \
 | 
|    csharp/src/Google.Protobuf.Test/JsonTokenizerTest.cs                       \
 | 
| -  csharp/src/Google.Protobuf.Test/Properties/AppManifest.xml                 \
 | 
| -  csharp/src/Google.Protobuf.Test/Properties/AssemblyInfo.cs                 \
 | 
|    csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs              \
 | 
|    csharp/src/Google.Protobuf.Test/Reflection/FieldAccessTest.cs              \
 | 
|    csharp/src/Google.Protobuf.Test/Reflection/TypeRegistryTest.cs             \
 | 
|    csharp/src/Google.Protobuf.Test/SampleEnum.cs                              \
 | 
|    csharp/src/Google.Protobuf.Test/SampleMessages.cs                          \
 | 
|    csharp/src/Google.Protobuf.Test/TestCornerCases.cs                         \
 | 
| +  csharp/src/Google.Protobuf.Test/TestProtos/ForeignMessagePartial.cs        \
 | 
|    csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs            \
 | 
|    csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs         \
 | 
|    csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs   \
 | 
| @@ -108,9 +107,10 @@ csharp_EXTRA_DIST=                                                           \
 | 
|    csharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs       \
 | 
|    csharp/src/Google.Protobuf.Test/WellKnownTypes/AnyTest.cs                  \
 | 
|    csharp/src/Google.Protobuf.Test/WellKnownTypes/DurationTest.cs             \
 | 
| +  csharp/src/Google.Protobuf.Test/WellKnownTypes/FieldMaskTest.cs            \
 | 
|    csharp/src/Google.Protobuf.Test/WellKnownTypes/TimestampTest.cs            \
 | 
|    csharp/src/Google.Protobuf.Test/WellKnownTypes/WrappersTest.cs             \
 | 
| -  csharp/src/Google.Protobuf.Test/packages.config                            \
 | 
| +  csharp/src/Google.Protobuf.Test/project.json                               \
 | 
|    csharp/src/Google.Protobuf.sln                                             \
 | 
|    csharp/src/Google.Protobuf/ByteArray.cs                                    \
 | 
|    csharp/src/Google.Protobuf/ByteString.cs                                   \
 | 
| @@ -124,8 +124,8 @@ csharp_EXTRA_DIST=                                                           \
 | 
|    csharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs                 \
 | 
|    csharp/src/Google.Protobuf/FieldCodec.cs                                   \
 | 
|    csharp/src/Google.Protobuf/FrameworkPortability.cs                         \
 | 
| -  csharp/src/Google.Protobuf/Google.Protobuf.csproj                          \
 | 
| -  csharp/src/Google.Protobuf/Google.Protobuf.nuspec                          \
 | 
| +  csharp/src/Google.Protobuf/Google.Protobuf.xproj                           \
 | 
| +  csharp/src/Google.Protobuf/ICustomDiagnosticMessage.cs                     \
 | 
|    csharp/src/Google.Protobuf/IDeepCloneable.cs                               \
 | 
|    csharp/src/Google.Protobuf/IMessage.cs                                     \
 | 
|    csharp/src/Google.Protobuf/InvalidJsonException.cs                         \
 | 
| @@ -173,6 +173,7 @@ csharp_EXTRA_DIST=                                                           \
 | 
|    csharp/src/Google.Protobuf/WellKnownTypes/DurationPartial.cs               \
 | 
|    csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs                         \
 | 
|    csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs                     \
 | 
| +  csharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs              \
 | 
|    csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs                 \
 | 
|    csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs                        \
 | 
|    csharp/src/Google.Protobuf/WellKnownTypes/TimeExtensions.cs                \
 | 
| @@ -183,7 +184,7 @@ csharp_EXTRA_DIST=                                                           \
 | 
|    csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs                      \
 | 
|    csharp/src/Google.Protobuf/WellKnownTypes/WrappersPartial.cs               \
 | 
|    csharp/src/Google.Protobuf/WireFormat.cs                                   \
 | 
| -  csharp/src/Google.Protobuf/packages.config                                 \
 | 
| +  csharp/src/Google.Protobuf/project.json                                    \
 | 
|    csharp/src/packages/repositories.config
 | 
|  
 | 
|  java_EXTRA_DIST=                                                                   \
 | 
| @@ -206,14 +207,17 @@ java_EXTRA_DIST=
 | 
|    java/core/src/main/java/com/google/protobuf/Descriptors.java                     \
 | 
|    java/core/src/main/java/com/google/protobuf/DoubleArrayList.java                 \
 | 
|    java/core/src/main/java/com/google/protobuf/DynamicMessage.java                  \
 | 
| +  java/core/src/main/java/com/google/protobuf/ExperimentalApi.java                 \
 | 
|    java/core/src/main/java/com/google/protobuf/Extension.java                       \
 | 
|    java/core/src/main/java/com/google/protobuf/ExtensionLite.java                   \
 | 
|    java/core/src/main/java/com/google/protobuf/ExtensionRegistry.java               \
 | 
| +  java/core/src/main/java/com/google/protobuf/ExtensionRegistryFactory.java        \
 | 
|    java/core/src/main/java/com/google/protobuf/ExtensionRegistryLite.java           \
 | 
|    java/core/src/main/java/com/google/protobuf/FieldSet.java                        \
 | 
|    java/core/src/main/java/com/google/protobuf/FloatArrayList.java                  \
 | 
|    java/core/src/main/java/com/google/protobuf/GeneratedMessage.java                \
 | 
|    java/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java            \
 | 
| +  java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java              \
 | 
|    java/core/src/main/java/com/google/protobuf/IntArrayList.java                    \
 | 
|    java/core/src/main/java/com/google/protobuf/Internal.java                        \
 | 
|    java/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java  \
 | 
| @@ -239,6 +243,7 @@ java_EXTRA_DIST=
 | 
|    java/core/src/main/java/com/google/protobuf/ProtocolMessageEnum.java             \
 | 
|    java/core/src/main/java/com/google/protobuf/ProtocolStringList.java              \
 | 
|    java/core/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java            \
 | 
| +  java/core/src/main/java/com/google/protobuf/RepeatedFieldBuilderV3.java          \
 | 
|    java/core/src/main/java/com/google/protobuf/RopeByteString.java                  \
 | 
|    java/core/src/main/java/com/google/protobuf/RpcCallback.java                     \
 | 
|    java/core/src/main/java/com/google/protobuf/RpcChannel.java                      \
 | 
| @@ -247,6 +252,7 @@ java_EXTRA_DIST=
 | 
|    java/core/src/main/java/com/google/protobuf/Service.java                         \
 | 
|    java/core/src/main/java/com/google/protobuf/ServiceException.java                \
 | 
|    java/core/src/main/java/com/google/protobuf/SingleFieldBuilder.java              \
 | 
| +  java/core/src/main/java/com/google/protobuf/SingleFieldBuilderV3.java            \
 | 
|    java/core/src/main/java/com/google/protobuf/SmallSortedMap.java                  \
 | 
|    java/core/src/main/java/com/google/protobuf/TextFormat.java                      \
 | 
|    java/core/src/main/java/com/google/protobuf/TextFormatEscaper.java               \
 | 
| @@ -257,6 +263,7 @@ java_EXTRA_DIST=
 | 
|    java/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java             \
 | 
|    java/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java      \
 | 
|    java/core/src/main/java/com/google/protobuf/UnsafeByteOperations.java            \
 | 
| +  java/core/src/main/java/com/google/protobuf/UnsafeUtil.java                      \
 | 
|    java/core/src/main/java/com/google/protobuf/Utf8.java                            \
 | 
|    java/core/src/main/java/com/google/protobuf/WireFormat.java                      \
 | 
|    java/core/src/test/java/com/google/protobuf/AbstractMessageTest.java             \
 | 
| @@ -273,6 +280,7 @@ java_EXTRA_DIST=
 | 
|    java/core/src/test/java/com/google/protobuf/DoubleArrayListTest.java             \
 | 
|    java/core/src/test/java/com/google/protobuf/DynamicMessageTest.java              \
 | 
|    java/core/src/test/java/com/google/protobuf/EnumTest.java                        \
 | 
| +  java/core/src/test/java/com/google/protobuf/ExtensionRegistryFactoryTest.java    \
 | 
|    java/core/src/test/java/com/google/protobuf/FieldPresenceTest.java               \
 | 
|    java/core/src/test/java/com/google/protobuf/FloatArrayListTest.java              \
 | 
|    java/core/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java        \
 | 
| @@ -295,16 +303,18 @@ java_EXTRA_DIST=
 | 
|    java/core/src/test/java/com/google/protobuf/MessageTest.java                     \
 | 
|    java/core/src/test/java/com/google/protobuf/NestedBuildersTest.java              \
 | 
|    java/core/src/test/java/com/google/protobuf/NioByteStringTest.java               \
 | 
| +  java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java             \
 | 
|    java/core/src/test/java/com/google/protobuf/ParserTest.java                      \
 | 
|    java/core/src/test/java/com/google/protobuf/ProtobufArrayListTest.java           \
 | 
| -  java/core/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java        \
 | 
| +  java/core/src/test/java/com/google/protobuf/RepeatedFieldBuilderV3Test.java      \
 | 
|    java/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java     \
 | 
|    java/core/src/test/java/com/google/protobuf/RopeByteStringTest.java              \
 | 
|    java/core/src/test/java/com/google/protobuf/ServiceTest.java                     \
 | 
| -  java/core/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java          \
 | 
| +  java/core/src/test/java/com/google/protobuf/SingleFieldBuilderV3Test.java        \
 | 
|    java/core/src/test/java/com/google/protobuf/SmallSortedMapTest.java              \
 | 
|    java/core/src/test/java/com/google/protobuf/TestBadIdentifiers.java              \
 | 
|    java/core/src/test/java/com/google/protobuf/TestUtil.java                        \
 | 
| +  java/core/src/test/java/com/google/protobuf/TestUtilLite.java                    \
 | 
|    java/core/src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java     \
 | 
|    java/core/src/test/java/com/google/protobuf/TextFormatParseLocationTest.java     \
 | 
|    java/core/src/test/java/com/google/protobuf/TextFormatTest.java                  \
 | 
| @@ -336,13 +346,17 @@ java_EXTRA_DIST=
 | 
|    java/core/src/test/proto/com/google/protobuf/test_check_utf8_size.proto          \
 | 
|    java/core/src/test/proto/com/google/protobuf/test_custom_options.proto           \
 | 
|    java/core/src/test/proto/com/google/protobuf/test_extra_interfaces.proto         \
 | 
| +  java/lite/generate-sources-build.xml                                             \
 | 
| +  java/lite/generate-test-sources-build.xml                                        \
 | 
|    java/lite/pom.xml                                                                \
 | 
|    java/pom.xml                                                                     \
 | 
|    java/util/pom.xml                                                                \
 | 
| +  java/util/src/main/java/com/google/protobuf/util/Durations.java                  \
 | 
|    java/util/src/main/java/com/google/protobuf/util/FieldMaskTree.java              \
 | 
|    java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java              \
 | 
|    java/util/src/main/java/com/google/protobuf/util/JsonFormat.java                 \
 | 
|    java/util/src/main/java/com/google/protobuf/util/TimeUtil.java                   \
 | 
| +  java/util/src/main/java/com/google/protobuf/util/Timestamps.java                 \
 | 
|    java/util/src/test/java/com/google/protobuf/util/FieldMaskTreeTest.java          \
 | 
|    java/util/src/test/java/com/google/protobuf/util/FieldMaskUtilTest.java          \
 | 
|    java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java             \
 | 
| @@ -461,8 +475,6 @@ objectivec_EXTRA_DIST=                                                       \
 | 
|    objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj                   \
 | 
|    objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata \
 | 
|    objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings \
 | 
| -  objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcbaselines/8BBEA4A5147C727100C4ADB7.xcbaseline/FFE465CA-0E74-40E8-9F09-500B66B7DCB2.plist \
 | 
| -  objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcbaselines/8BBEA4A5147C727100C4ADB7.xcbaseline/Info.plist \
 | 
|    objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme \
 | 
|    objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme \
 | 
|    objectivec/ProtocolBuffers_OSX.xcodeproj/project.pbxproj                   \
 | 
| @@ -471,6 +483,33 @@ objectivec_EXTRA_DIST=                                                       \
 | 
|    objectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme \
 | 
|    objectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme \
 | 
|    objectivec/README.md                                                       \
 | 
| +  objectivec/Tests/CocoaPods/OSXCocoaPodsTester/OSXCocoaPodsTester.xcodeproj/project.pbxproj \
 | 
| +  objectivec/Tests/CocoaPods/OSXCocoaPodsTester/OSXCocoaPodsTester.xcodeproj/project.xcworkspace/contents.xcworkspacedata \
 | 
| +  objectivec/Tests/CocoaPods/OSXCocoaPodsTester/OSXCocoaPodsTester.xcodeproj/xcshareddata/xcschemes/OSXCocoaPodsTester.xcscheme \
 | 
| +  objectivec/Tests/CocoaPods/OSXCocoaPodsTester/OSXCocoaPodsTester/AppDelegate.h \
 | 
| +  objectivec/Tests/CocoaPods/OSXCocoaPodsTester/OSXCocoaPodsTester/AppDelegate.m \
 | 
| +  objectivec/Tests/CocoaPods/OSXCocoaPodsTester/OSXCocoaPodsTester/Assets.xcassets/AppIcon.appiconset/Contents.json \
 | 
| +  objectivec/Tests/CocoaPods/OSXCocoaPodsTester/OSXCocoaPodsTester/Base.lproj/MainMenu.xib \
 | 
| +  objectivec/Tests/CocoaPods/OSXCocoaPodsTester/OSXCocoaPodsTester/Info.plist \
 | 
| +  objectivec/Tests/CocoaPods/OSXCocoaPodsTester/OSXCocoaPodsTester/main.m    \
 | 
| +  objectivec/Tests/CocoaPods/OSXCocoaPodsTester/Podfile-framework            \
 | 
| +  objectivec/Tests/CocoaPods/OSXCocoaPodsTester/Podfile-static               \
 | 
| +  objectivec/Tests/CocoaPods/README.md                                       \
 | 
| +  objectivec/Tests/CocoaPods/iOSCocoaPodsTester/Podfile-framework            \
 | 
| +  objectivec/Tests/CocoaPods/iOSCocoaPodsTester/Podfile-static               \
 | 
| +  objectivec/Tests/CocoaPods/iOSCocoaPodsTester/iOSCocoaPodsTester.xcodeproj/project.pbxproj \
 | 
| +  objectivec/Tests/CocoaPods/iOSCocoaPodsTester/iOSCocoaPodsTester.xcodeproj/project.xcworkspace/contents.xcworkspacedata \
 | 
| +  objectivec/Tests/CocoaPods/iOSCocoaPodsTester/iOSCocoaPodsTester.xcodeproj/xcshareddata/xcschemes/iOSCocoaPodsTester.xcscheme \
 | 
| +  objectivec/Tests/CocoaPods/iOSCocoaPodsTester/iOSCocoaPodsTester/AppDelegate.h \
 | 
| +  objectivec/Tests/CocoaPods/iOSCocoaPodsTester/iOSCocoaPodsTester/AppDelegate.m \
 | 
| +  objectivec/Tests/CocoaPods/iOSCocoaPodsTester/iOSCocoaPodsTester/Assets.xcassets/AppIcon.appiconset/Contents.json \
 | 
| +  objectivec/Tests/CocoaPods/iOSCocoaPodsTester/iOSCocoaPodsTester/Base.lproj/LaunchScreen.storyboard \
 | 
| +  objectivec/Tests/CocoaPods/iOSCocoaPodsTester/iOSCocoaPodsTester/Base.lproj/Main.storyboard \
 | 
| +  objectivec/Tests/CocoaPods/iOSCocoaPodsTester/iOSCocoaPodsTester/Info.plist \
 | 
| +  objectivec/Tests/CocoaPods/iOSCocoaPodsTester/iOSCocoaPodsTester/ViewController.h \
 | 
| +  objectivec/Tests/CocoaPods/iOSCocoaPodsTester/iOSCocoaPodsTester/ViewController.m \
 | 
| +  objectivec/Tests/CocoaPods/iOSCocoaPodsTester/iOSCocoaPodsTester/main.m    \
 | 
| +  objectivec/Tests/CocoaPods/run_tests.sh                                    \
 | 
|    objectivec/Tests/golden_message                                            \
 | 
|    objectivec/Tests/golden_packed_fields_message                              \
 | 
|    objectivec/Tests/GPBARCUnittestProtos.m                                    \
 | 
| @@ -496,6 +535,7 @@ objectivec_EXTRA_DIST=                                                       \
 | 
|    objectivec/Tests/GPBTestUtilities.h                                        \
 | 
|    objectivec/Tests/GPBTestUtilities.m                                        \
 | 
|    objectivec/Tests/GPBUnittestProtos.m                                       \
 | 
| +  objectivec/Tests/GPBUnittestProtos2.m                                      \
 | 
|    objectivec/Tests/GPBUnknownFieldSetTest.m                                  \
 | 
|    objectivec/Tests/GPBUtilitiesTests.m                                       \
 | 
|    objectivec/Tests/GPBWellKnownTypesTest.m                                   \
 | 
| @@ -517,6 +557,13 @@ objectivec_EXTRA_DIST=                                                       \
 | 
|    objectivec/Tests/text_format_map_unittest_data.txt                          \
 | 
|    objectivec/Tests/text_format_unittest_data.txt                              \
 | 
|    objectivec/Tests/unittest_cycle.proto                                       \
 | 
| +  objectivec/Tests/unittest_extension_chain_a.proto                           \
 | 
| +  objectivec/Tests/unittest_extension_chain_b.proto                           \
 | 
| +  objectivec/Tests/unittest_extension_chain_c.proto                           \
 | 
| +  objectivec/Tests/unittest_extension_chain_d.proto                           \
 | 
| +  objectivec/Tests/unittest_extension_chain_e.proto                           \
 | 
| +  objectivec/Tests/unittest_extension_chain_f.proto                           \
 | 
| +  objectivec/Tests/unittest_extension_chain_g.proto                           \
 | 
|    objectivec/Tests/unittest_objc.proto                                        \
 | 
|    objectivec/Tests/unittest_objc_startup.proto                                \
 | 
|    objectivec/Tests/unittest_runtime_proto2.proto                              \
 | 
| @@ -525,6 +572,58 @@ objectivec_EXTRA_DIST=                                                       \
 | 
|    objectivec/Tests/UnitTests-Info.plist                                       \
 | 
|    Protobuf.podspec
 | 
|  
 | 
| +php_EXTRA_DIST=                                              \
 | 
| +  php/src/phpdoc.dist.xml                                    \
 | 
| +  php/src/Google/Protobuf/Internal/DescriptorPool.php        \
 | 
| +  php/src/Google/Protobuf/Internal/OneofField.php            \
 | 
| +  php/src/Google/Protobuf/Internal/MapEntry.php              \
 | 
| +  php/src/Google/Protobuf/Internal/InputStream.php           \
 | 
| +  php/src/Google/Protobuf/Internal/OutputStream.php          \
 | 
| +  php/src/Google/Protobuf/Internal/MessageBuilderContext.php \
 | 
| +  php/src/Google/Protobuf/Internal/MapField.php              \
 | 
| +  php/src/Google/Protobuf/Internal/RepeatedField.php         \
 | 
| +  php/src/Google/Protobuf/Internal/Message.php               \
 | 
| +  php/src/Google/Protobuf/Internal/GPBWire.php               \
 | 
| +  php/src/Google/Protobuf/Internal/GPBType.php               \
 | 
| +  php/src/Google/Protobuf/Internal/GPBLabel.php              \
 | 
| +  php/src/Google/Protobuf/Internal/EnumBuilderContext.php    \
 | 
| +  php/src/Google/Protobuf/Internal/GPBUtil.php               \
 | 
| +  php/src/Google/Protobuf/descriptor_internal.pb.php         \
 | 
| +  php/src/Google/Protobuf/descriptor.php                     \
 | 
| +  php/tests/encode_decode_test.php                           \
 | 
| +  php/tests/test.sh                                          \
 | 
| +  php/tests/generated_class_test.php                         \
 | 
| +  php/tests/array_test.php                                   \
 | 
| +  php/tests/php_implementation_test.php                      \
 | 
| +  php/tests/test_include.proto                               \
 | 
| +  php/tests/test_include.pb.php                              \
 | 
| +  php/tests/map_field_test.php                               \
 | 
| +  php/tests/test_base.php                                    \
 | 
| +  php/tests/test_no_namespace.proto                          \
 | 
| +  php/tests/test_no_namespace.pb.php                         \
 | 
| +  php/tests/test_util.php                                    \
 | 
| +  php/tests/test.proto                                       \
 | 
| +  php/tests/test.pb.php                                      \
 | 
| +  php/tests/memory_leak_test.php                             \
 | 
| +  php/README.md                                              \
 | 
| +  php/ext/google/protobuf/utf8.h                             \
 | 
| +  php/ext/google/protobuf/message.c                          \
 | 
| +  php/ext/google/protobuf/utf8.c                             \
 | 
| +  php/ext/google/protobuf/package.xml                        \
 | 
| +  php/ext/google/protobuf/upb.h                              \
 | 
| +  php/ext/google/protobuf/array.c                            \
 | 
| +  php/ext/google/protobuf/encode_decode.c                    \
 | 
| +  php/ext/google/protobuf/protobuf.h                         \
 | 
| +  php/ext/google/protobuf/type_check.c                       \
 | 
| +  php/ext/google/protobuf/def.c                              \
 | 
| +  php/ext/google/protobuf/storage.c                          \
 | 
| +  php/ext/google/protobuf/map.c                              \
 | 
| +  php/ext/google/protobuf/config.m4                          \
 | 
| +  php/ext/google/protobuf/upb.c                              \
 | 
| +  php/ext/google/protobuf/protobuf.c                         \
 | 
| +  phpunit.xml                                                \
 | 
| +  composer.json
 | 
| +
 | 
|  python_EXTRA_DIST=                                                           \
 | 
|    python/MANIFEST.in                                                         \
 | 
|    python/google/__init__.py                                                  \
 | 
| @@ -549,6 +648,7 @@ python_EXTRA_DIST=                                                           \
 | 
|    python/google/protobuf/internal/enum_type_wrapper.py                       \
 | 
|    python/google/protobuf/internal/factory_test1.proto                        \
 | 
|    python/google/protobuf/internal/factory_test2.proto                        \
 | 
| +  python/google/protobuf/internal/file_options_test.proto                    \
 | 
|    python/google/protobuf/internal/generator_test.py                          \
 | 
|    python/google/protobuf/internal/import_test_package/__init__.py            \
 | 
|    python/google/protobuf/internal/import_test_package/inner.proto            \
 | 
| @@ -570,6 +670,7 @@ python_EXTRA_DIST=                                                           \
 | 
|    python/google/protobuf/internal/symbol_database_test.py                    \
 | 
|    python/google/protobuf/internal/test_bad_identifiers.proto                 \
 | 
|    python/google/protobuf/internal/test_util.py                               \
 | 
| +  python/google/protobuf/internal/testing_refleaks.py                        \
 | 
|    python/google/protobuf/internal/text_encoding_test.py                      \
 | 
|    python/google/protobuf/internal/text_format_test.py                        \
 | 
|    python/google/protobuf/internal/type_checkers.py                           \
 | 
| @@ -601,6 +702,9 @@ python_EXTRA_DIST=                                                           \
 | 
|    python/google/protobuf/pyext/map_container.h                               \
 | 
|    python/google/protobuf/pyext/message.cc                                    \
 | 
|    python/google/protobuf/pyext/message.h                                     \
 | 
| +  python/google/protobuf/pyext/message_factory.cc                            \
 | 
| +  python/google/protobuf/pyext/message_factory.h                             \
 | 
| +  python/google/protobuf/pyext/message_module.cc                             \
 | 
|    python/google/protobuf/pyext/proto2_api_test.proto                         \
 | 
|    python/google/protobuf/pyext/python.proto                                  \
 | 
|    python/google/protobuf/pyext/python_protobuf.h                             \
 | 
| @@ -616,6 +720,7 @@ python_EXTRA_DIST=                                                           \
 | 
|    python/google/protobuf/text_encoding.py                                    \
 | 
|    python/google/protobuf/text_format.py                                      \
 | 
|    python/mox.py                                                              \
 | 
| +  python/setup.cfg                                                           \
 | 
|    python/setup.py                                                            \
 | 
|    python/stubout.py                                                          \
 | 
|    python/tox.ini                                                             \
 | 
| @@ -623,7 +728,6 @@ python_EXTRA_DIST=                                                           \
 | 
|  
 | 
|  ruby_EXTRA_DIST=                                                             \
 | 
|    ruby/Gemfile                                                               \
 | 
| -  ruby/Gemfile.lock                                                          \
 | 
|    ruby/.gitignore                                                            \
 | 
|    ruby/README.md                                                             \
 | 
|    ruby/Rakefile                                                              \
 | 
| @@ -641,6 +745,7 @@ ruby_EXTRA_DIST=                                                             \
 | 
|    ruby/google-protobuf.gemspec                                               \
 | 
|    ruby/lib/google/protobuf/message_exts.rb                                   \
 | 
|    ruby/lib/google/protobuf/repeated_field.rb                                 \
 | 
| +  ruby/lib/google/protobuf/well_known_types.rb                               \
 | 
|    ruby/lib/google/protobuf.rb                                                \
 | 
|    ruby/pom.xml                                                               \
 | 
|    ruby/src/main/java/com/google/protobuf/jruby/RubyBuilder.java              \
 | 
| @@ -665,44 +770,57 @@ ruby_EXTRA_DIST=                                                             \
 | 
|    ruby/tests/repeated_field_test.rb                                          \
 | 
|    ruby/tests/stress.rb                                                       \
 | 
|    ruby/tests/generated_code.proto                                            \
 | 
| +  ruby/tests/test_import.proto                                               \
 | 
|    ruby/tests/generated_code_test.rb                                          \
 | 
| +  ruby/tests/well_known_types_test.rb                                        \
 | 
|    ruby/travis-test.sh
 | 
|  
 | 
| -js_EXTRA_DIST=              \
 | 
| -  js/README.md              \
 | 
| -  js/binary/arith.js        \
 | 
| -  js/binary/arith_test.js   \
 | 
| -  js/binary/constants.js    \
 | 
| -  js/binary/decoder.js      \
 | 
| -  js/binary/decoder_test.js \
 | 
| -  js/binary/proto_test.js   \
 | 
| -  js/binary/reader.js       \
 | 
| -  js/binary/reader_test.js  \
 | 
| -  js/binary/utils.js        \
 | 
| -  js/binary/utils_test.js   \
 | 
| -  js/binary/writer.js       \
 | 
| -  js/binary/writer_test.js  \
 | 
| -  js/data.proto             \
 | 
| -  js/debug.js               \
 | 
| -  js/debug_test.js          \
 | 
| -  js/gulpfile.js            \
 | 
| -  js/jasmine.json           \
 | 
| -  js/message.js             \
 | 
| -  js/message_test.js        \
 | 
| -  js/node_loader.js         \
 | 
| -  js/package.json           \
 | 
| -  js/proto3_test.js         \
 | 
| -  js/proto3_test.proto      \
 | 
| -  js/test.proto             \
 | 
| -  js/test2.proto            \
 | 
| -  js/test3.proto            \
 | 
| -  js/test4.proto            \
 | 
| -  js/test5.proto            \
 | 
| -  js/test_bootstrap.js      \
 | 
| -  js/testbinary.proto       \
 | 
| +js_EXTRA_DIST=                              \
 | 
| +  js/README.md                              \
 | 
| +  js/binary/arith.js                        \
 | 
| +  js/binary/arith_test.js                   \
 | 
| +  js/binary/constants.js                    \
 | 
| +  js/binary/decoder.js                      \
 | 
| +  js/binary/decoder_test.js                 \
 | 
| +  js/binary/encoder.js                      \
 | 
| +  js/binary/proto_test.js                   \
 | 
| +  js/binary/reader.js                       \
 | 
| +  js/binary/reader_test.js                  \
 | 
| +  js/binary/utils.js                        \
 | 
| +  js/binary/utils_test.js                   \
 | 
| +  js/binary/writer.js                       \
 | 
| +  js/binary/writer_test.js                  \
 | 
| +  js/commonjs/export.js                     \
 | 
| +  js/commonjs/export_asserts.js             \
 | 
| +  js/commonjs/export_testdeps.js            \
 | 
| +  js/commonjs/import_test.js                \
 | 
| +  js/commonjs/jasmine.json                  \
 | 
| +  js/commonjs/rewrite_tests_for_commonjs.js \
 | 
| +  js/commonjs/test6/test6.proto             \
 | 
| +  js/commonjs/test7/test7.proto             \
 | 
| +  js/data.proto                             \
 | 
| +  js/debug.js                               \
 | 
| +  js/debug_test.js                          \
 | 
| +  js/gulpfile.js                            \
 | 
| +  js/jasmine.json                           \
 | 
| +  js/map.js                                 \
 | 
| +  js/maps_test.js                           \
 | 
| +  js/message.js                             \
 | 
| +  js/message_test.js                        \
 | 
| +  js/node_loader.js                         \
 | 
| +  js/package.json                           \
 | 
| +  js/proto3_test.js                         \
 | 
| +  js/proto3_test.proto                      \
 | 
| +  js/test.proto                             \
 | 
| +  js/test2.proto                            \
 | 
| +  js/test3.proto                            \
 | 
| +  js/test4.proto                            \
 | 
| +  js/test5.proto                            \
 | 
| +  js/test_bootstrap.js                      \
 | 
| +  js/testbinary.proto                       \
 | 
|    js/testempty.proto
 | 
|  
 | 
| -all_EXTRA_DIST=$(csharp_EXTRA_DIST) $(java_EXTRA_DIST) $(javanano_EXTRA_DIST) $(objectivec_EXTRA_DIST) $(python_EXTRA_DIST) $(ruby_EXTRA_DIST) $(js_EXTRA_DIST)
 | 
| +all_EXTRA_DIST=$(csharp_EXTRA_DIST) $(java_EXTRA_DIST) $(javanano_EXTRA_DIST) $(objectivec_EXTRA_DIST) $(php_EXTRA_DIST) $(python_EXTRA_DIST) $(ruby_EXTRA_DIST) $(js_EXTRA_DIST)
 | 
|  
 | 
|  EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST)   \
 | 
|    autogen.sh                             \
 | 
| @@ -717,6 +835,7 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST)   \
 | 
|    WORKSPACE                              \
 | 
|    cmake/CMakeLists.txt                   \
 | 
|    cmake/README.md                        \
 | 
| +  cmake/examples.cmake                   \
 | 
|    cmake/extract_includes.bat.in          \
 | 
|    cmake/install.cmake                    \
 | 
|    cmake/libprotobuf.cmake                \
 | 
| @@ -725,11 +844,13 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST)   \
 | 
|    cmake/protobuf-config-version.cmake.in \
 | 
|    cmake/protobuf-config.cmake.in         \
 | 
|    cmake/protobuf-module.cmake.in         \
 | 
| +  cmake/protobuf-options.cmake           \
 | 
|    cmake/protoc.cmake                     \
 | 
|    cmake/tests.cmake                      \
 | 
|    editors/README.txt                     \
 | 
|    editors/proto.vim                      \
 | 
|    editors/protobuf-mode.el               \
 | 
| +  examples/CMakeLists.txt                \
 | 
|    examples/README.txt                    \
 | 
|    examples/Makefile                      \
 | 
|    examples/addressbook.proto             \
 | 
| @@ -739,6 +860,7 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST)   \
 | 
|    examples/list_people.cc                \
 | 
|    examples/list_people.go                \
 | 
|    examples/AddPerson.java                \
 | 
| +  examples/CMakeLists.txt                \
 | 
|    examples/ListPeople.java               \
 | 
|    examples/add_person.py                 \
 | 
|    examples/list_people.py                \
 | 
| 
 |