Upstream version 2.69+dfsg