Merge "Fix compile errors on MS-Windows." into devel/master