diff --git a/autogen.sh b/autogen.sh
index d00d21727c2d..105bf09b6711 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -30,8 +30,12 @@ set -ex
 
 # The absence of a m4 directory in googletest causes autoreconf to fail when
 # building under the CentOS docker image. It's a warning in regular build on
-# Ubuntu/gLinux as well.
-mkdir -p third_party/googletest/m4
+# Ubuntu/gLinux as well. (This is only needed if git submodules have been
+# initialized, which is typically only needed for testing; see the installation
+# instructions for details.)
+if test -d third_party/googletest; then
+  mkdir -p third_party/googletest/m4
+fi
 
 # TODO(kenton):  Remove the ",no-obsolete" part and fix the resulting warnings.
 autoreconf -f -i -Wall,no-obsolete
diff --git a/objectivec/README.md b/objectivec/README.md
index 2583779d38f0..bbe5726d455b 100644
--- a/objectivec/README.md
+++ b/objectivec/README.md
@@ -194,4 +194,4 @@ Documentation
 The complete documentation for Protocol Buffers is available via the
 web at:
 
-    https://developers.google.com/protocol-buffers/
+https://developers.google.com/protocol-buffers/
diff --git a/src/README.md b/src/README.md
index 78d6bb5ec72c..ec4901d8946f 100644
--- a/src/README.md
+++ b/src/README.md
@@ -229,4 +229,4 @@ Usage
 The complete documentation for Protocol Buffers is available via the
 web at:
 
-    https://developers.google.com/protocol-buffers/
+https://developers.google.com/protocol-buffers/