null merge of branch 3.4-slp (except for .hgtags)

Author: Anselm Kruis

.hgtags

@@ -165,6 +165,7 @@ afb86a6eab458e22c2c6ba83eba903ee7aadc35b v3.3.6-slp
 95a0bb8bd61d303fa324127abc1dbcec437e0bc5 v3.2.6-slp
 69dd528ca6255a66c37cc5cf680e8357d108b036 v3.4.3rc1
 b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3
+28c418000b779bc2316004b1136a3467a1cd2c8d v3.4.3-slp
 04f3f725896c6961212c3a12e8ac25be6958f4fa v3.4.4rc1
 737efcadf5a678b184e0fa431aae11276bf06648 v3.4.4
 3631bb4a2490292ebf81d3e947ae36da145da564 v3.4.5rc1