Merge official-stockfish/master

No functional change.

diff --cc src/bitboard.h
Simple merge

diff --cc src/endgame.cpp
Simple merge

diff --cc src/search.cpp
Simple merge

diff --cc src/syzygy/tbprobe.cpp
Simple merge

diff --cc src/tt.h
Simple merge

diff --cc src/types.h
Simple merge

diff --cc src/uci.cpp
index 93d1180,33577a4..8c36a80
--- 1/src/uci.cpp
--- 2/src/uci.cpp
+++ b/src/uci.cpp
@@@ -322,21 -260,10 +322,21 @@@ string UCI::value(Value v) 
  
    stringstream ss;
  
 +  if (Options["Protocol"] == "xboard")
 +  {
-       if (abs(v) < VALUE_MATE - MAX_PLY)
++      if (abs(v) < VALUE_MATE_IN_MAX_PLY)
 +          ss << v * 100 / PawnValueEg;
 +      else
 +          ss << (v > 0 ? XBOARD_VALUE_MATE + VALUE_MATE - v + 1 : -XBOARD_VALUE_MATE - VALUE_MATE - v - 1) / 2;
 +  } else
 +
-   if (abs(v) < VALUE_MATE - MAX_PLY)
+   if (abs(v) < VALUE_MATE_IN_MAX_PLY)
        ss << "cp " << v * 100 / PawnValueEg;
 +  else if (Options["Protocol"] == "usi")
 +      // In USI, mate distance is given in ply
 +      ss << "mate " << (v > 0 ? VALUE_MATE - v : -VALUE_MATE - v);
    else
 -      ss << "mate " << (v > 0 ? VALUE_MATE - v + 1 : -VALUE_MATE - v) / 2;
 +      ss << "mate " << (v > 0 ? VALUE_MATE - v + 1 : -VALUE_MATE - v - 1) / 2;
  
    return ss.str();
  }