Upstream version 2.41+dfsg