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