Cherry-pick, not merge. With a "backport" in the log message, please.

Unfortunately, I'm new to git, so I have to read up on how to do that.

-- Anders