Upstream version 2.34+dfsg