upstream changes related to syslinux6
Merge pull request #1 from lots0logs/master

 upstream changes related to syslinux6