synchronize patches with Debian Sid