Upstream version 2.53+dfsg