Resync with Debian's 1.157.1-1