Upstream version 2.68+dfsg