Merge branch 'syslinux-3.7x'