Merge 5.0-build up to 5.1-build

This is the backmerge of 5.0.74sp1 into the main sources,
but effectively a null-merge, because the changes in that version
were backports of changes already present in later sources.