Sync to latest firmware header changes
Merge pull request #859 from DonLakeFlyer/FTP

Sync to latest firmware header changes