Merge "Fix build error on Windows" into devel/master