Merge patches from mc 3:4.8.13-3 in Debian