Changes from 1.92.1.0

[mcarans]

Bring over changes from 1.92.1.0. I have tested on Linux and Windows.

I decided it would be better to do this first and make sure it is working ok than to add it to my build reworking which is in progress.

[LW-archlinux]

Pity it's one huge commit .

Maybe git cherry-pick can be used to port the individual commits ?

https://git-scm.com/docs/git-cherry-pick
https://stackoverflow.com/questions/2474353/how-to-copy-commits-from-one-branch-to-another#2474430

[mcarans]

@LW-archlinux The first answer there and comments below seems to explain why not to cherry pick:

"This isn't really a good thing - the whole point of easy branching and merging is to be able to do everything by making commit(s) one place and merging them into wherever they're needed. Duplicate commits mean an intent never to merge those two branches"

In any case it looks like it would be a lot of work for little benefit.

I already stripped out any whitespace changes to make the changes obvious in the current PR.

[oocube]

@LW-archlinux The first answer there and comments below seems to explain why not to cherry pick:

"This isn't really a good thing - the whole point of easy branching and merging is to be able to do everything by making commit(s) one place and merging them into wherever they're needed. Duplicate commits mean an intent never to merge those two branches"

That is true. Commits / PRs should easily be applied to different branches. But that also involves keeping things simple for others. One PR for one feature or fix, and it can easily be tested and merged.

Just imagine there were several developers working on the project in parallel, and one of them comes with a huge PR touching everything while others already merged their changes? Guess who would have to rebase? That's the moment where the amount of work gets huge quickly. At that moment cherry picking may be the best option (although I am happy to never have needed it).

[mcarans]

Closing PR in favour of cherry picking. Please see my question about how to cherry pick here: https://bb.oolite.space/viewtopic.php?p=304570#p304570