Merge "Fix compiler warnigns for msvc2013"