Merge "Fix MSVC warning." into devel/master