keep header.exe in the -dev package
Merge remote-tracking branch 'origin/master'
update 7.36