Merge branch 'maybe-for-v2.32' of https://github.com/rudimeier/util-linux