Synchronise with Debian's version 1.157.3-1