Resync with Debian's 1.139.1-1 version