Merge "MS Windows - window surface fix." into devel/master