Also port some "glaringly obvious" bugfixes from HEAD. Hope it doesn't cause problems. [SVN r35237]
@@ -1 +1 @@
-Subproject commit 7ff0f627292d11153fdfa9380d70134e0acb4468
+Subproject commit e70bbe4791d53f009f88fbf3025a77f78649b42d