AW: Unreleased fixes in master

[Bastian M. <bma...@we...>]

> If there's just one take-away from this, it's try to avoid using
cherry-pick.

cherry-pick is what I used. The reason behind this is probably that
it resembles what we had been doing with the previous versioning
system CVS.  That is OK for developers closely following gnuplot
development but might be difficult for others indeed.

Let me note that for the past decade (or longer) on the order of 3 out
of 4 commits were done by Ethan. So it's really him who has to be
comfortable with the process.  A more "modern style" way of
handling merges etc. might still make it easier in particular for new
contributors.

  Bastian