Upstream version 1.69+dfsg