diff --git a/.gitmodules b/.gitmodules
index a000a725f8..55a47ceafe 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,3 @@
 [submodule "third_party/benchmark"]
 	path = third_party/benchmark
 	url = https://github.com/google/benchmark.git
-
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
index aa65c02f8a..2158feac3f 100755
--- a/benchmarks/Makefile.am
+++ b/benchmarks/Makefile.am
@@ -125,8 +125,8 @@ cpp: protoc_middleman protoc_middleman2 cpp-benchmark
 ############# JAVA RULES ##############
 
 java_benchmark_testing_files = 
-	java/src/main/java/com/google/protocolbuffers/ProtoBench.java            \
-	java/src/main/java/com/google/protocolbuffers/ProtoBenchCaliper.java
+	java/src/main/java/com/google/protobuf/ProtoBench.java            \
+	java/src/main/java/com/google/protobuf/ProtoBenchCaliper.java
 
 javac_middleman: $(java_benchmark_testing_files) protoc_middleman protoc_middleman2
 	cp -r java tmp && cd tmp/java &&  mvn clean compile assembly:single
diff --git a/benchmarks/java/pom.xml b/benchmarks/java/pom.xml
index 3afeebcacd..f82f911b26 100755
--- a/benchmarks/java/pom.xml
+++ b/benchmarks/java/pom.xml
@@ -91,4 +91,5 @@
       </plugins>
     </pluginManagement>
   </build>
-</project>
\ No newline at end of file
+</project>
+
diff --git a/python/dist/protobuf-3.5.0.post1-py2.7.egg b/python/dist/protobuf-3.5.0.post1-py2.7.egg
new file mode 100755
index 0000000000..56e0b0962a
Binary files /dev/null and b/python/dist/protobuf-3.5.0.post1-py2.7.egg differ