Merge commit 'syslinux-4.04' into dynamic-sector