Merge branch 'master' into sync-stage

js/README.md

@@ -95,7 +95,7 @@ statements like:
 
     var message = proto.my.package.MyMessage();
 
-If unfamiliar with Closure or it's compiler, consider reviewing Closure documentation
+If unfamiliar with Closure or its compiler, consider reviewing Closure documentation
 https://developers.google.com/closure/library/docs/tutorial
 https://developers.google.com/closure/library/docs/closurebuilder
 https://developers.google.com/closure/library/docs/depswriter

src/google/protobuf/compiler/cpp/cpp_helpers.cc

@@ -662,14 +662,7 @@ static std::string UInt64ToString(uint64_t number) {
 }
 
 std::string DefaultValue(const FieldDescriptor* field) {
-  switch (field->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT64:
-      return Int64ToString(field->default_value_int64());
-    case FieldDescriptor::CPPTYPE_UINT64:
-      return UInt64ToString(field->default_value_uint64());
-    default:
-      return DefaultValue(Options(), field);
-  }
+  return DefaultValue(Options(), field);
 }
 
 std::string DefaultValue(const Options& options, const FieldDescriptor* field) {