Upstream version 0.68+dfsg