Merge "Fix compile error in MS-Windows." into devel/master