Backport to 4.2

[Brooks Moses]

François-Xavier Coudert wrote:
> I just commited the attached (big) backport to 4.2, fixing and closing
> PRs 30420, 30381, 30389, 30611, 30720. I took the liberty to act in
> place of the original patch commiters, to try clear the backlog of
> backports slowing building up.

I see that there was one of mine in there.  Thanks for taking care of 
that; I've been meaning to for weeks, and hadn't gotten around to it....

I'll try to check and see if I have any more next week.

- Brooks