Upstream version 25.2+dfsg