Upstream version 1.79+dfsg