Upstream version 7.81+dfsg