Merge "MS Windows - Fix compile errors when debug is enabled." into devel/master