Merge "Few warnings removed (MSVC)." into devel/master