In May, I wrote: > A patch has been committed upstream which is intended to deal with this > (as of r17431), [...] For the avoidance of doubt: this patch went in between the 2.2.0 and 2.2.1 releases, so Debian now has it.