Merge official-stockfish/master

bench: 4073348

diff --cc src/evaluate.cpp
Simple merge

diff --cc src/evaluate.h
Simple merge

diff --cc src/movepick.cpp
index dbf61ee,9ca1a21..29a24d2
--- 1/src/movepick.cpp
--- 2/src/movepick.cpp
+++ b/src/movepick.cpp
@@@ -109,10 -105,11 +109,11 @@@ void MovePicker::score() 
  
        else if (Type == QUIETS)
            m.value =      (*mainHistory)[pos.side_to_move()][from_to(m)]
+                    +     (*staticHistory)[pos.side_to_move()][from_to(m)]
 -                   + 2 * (*continuationHistory[0])[pos.moved_piece(m)][to_sq(m)]
 -                   + 2 * (*continuationHistory[1])[pos.moved_piece(m)][to_sq(m)]
 -                   + 2 * (*continuationHistory[3])[pos.moved_piece(m)][to_sq(m)]
 -                   +     (*continuationHistory[5])[pos.moved_piece(m)][to_sq(m)]
 +                   + 2 * (*continuationHistory[0])[history_slot(pos.moved_piece(m))][to_sq(m)]
 +                   + 2 * (*continuationHistory[1])[history_slot(pos.moved_piece(m))][to_sq(m)]
 +                   + 2 * (*continuationHistory[3])[history_slot(pos.moved_piece(m))][to_sq(m)]
 +                   +     (*continuationHistory[5])[history_slot(pos.moved_piece(m))][to_sq(m)]
                     + (ply < MAX_LPH ? std::min(4, depth / 3) * (*lowPlyHistory)[ply][from_to(m)] : 0);
  
        else // Type == EVASIONS

diff --cc src/movepick.h
Simple merge

diff --cc src/search.cpp
Simple merge

diff --cc src/thread.cpp
Simple merge

diff --cc src/thread.h
Simple merge