down-integrate internal changes
diff --git a/python/setup.py b/python/setup.py
index a1365fb..5c321f5 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -91,6 +91,7 @@
   if not os.path.exists("../.git"):
     return
 
+  generate_proto("../src/google/protobuf/map_unittest.proto")
   generate_proto("../src/google/protobuf/unittest.proto")
   generate_proto("../src/google/protobuf/unittest_custom_options.proto")
   generate_proto("../src/google/protobuf/unittest_import.proto")