[Laszlo-dev] LPP-7487 for 4.2.0.1

[André Bargull]

LPP-7487 was discovered right before the 4.2 release, so it didn't get 
into the final builds. But I think it should get into 4.2.0.1.