Upstream version 0.99+dfsg