Merge remote-tracking branch 'upstream/master' into remerge-2.8.0

Git somehow pushed one history as master branch and another,
with same commit contents and a tag to one of them, as the
official NUT v2.8.0 release. This merge commit brings the
publicly tagged commit history "back" into the mainline.

Probably a fallout from GitHub "Rebase and Merge" action.