Fix WIN32 headers for iscam.tpl #includes
Merge remote-tracking branch 'cgrandin/IPHC-developer' into IPHC-developer
Fixed merge conflicts with cgrandin