Fixes VS compilation issue

binary '<<' : no operator found which takes a right-hand operand of type
'std::string' (or there is no acceptable conversion)
Merge branch 'master' into mnap