Sync with master

bench: 7696257

diff --cc src/Makefile
Simple merge

diff --cc src/material.cpp
index e22942128f4a98974f856ecefb836c15b091ff8a,9873a44eb94c4dcf6205bbce3984a3eb3c5264de..ebf5adff854abc4bb6770c6547795e72c7d791c7
--- 1/src/material.cpp
--- 2/src/material.cpp
+++ b/src/material.cpp
@@@ -139,20 -136,15 +136,15 @@@ Entry* probe(const Position& pos) 
    // Let's look if we have a specialized evaluation function for this particular
    // material configuration. Firstly we look for a fixed configuration one, then
    // for a generic one if the previous search failed.
 -  if (pos.this_thread()->endgames.probe(key, e->evaluationFunction))
 +  if ((e->evaluationFunction = pos.this_thread()->endgames.probe<Value>(key)) != nullptr)
        return e;
  
-   if (is_KXK<WHITE>(pos))
-   {
-       e->evaluationFunction = &EvaluateKXK[WHITE];
-       return e;
-   }
- 
-   if (is_KXK<BLACK>(pos))
-   {
-       e->evaluationFunction = &EvaluateKXK[BLACK];
-       return e;
-   }
+   for (Color c = WHITE; c <= BLACK; ++c)
+       if (is_KXK(pos, c))
+       {
+           e->evaluationFunction = &EvaluateKXK[c];
+           return e;
+       }
  
    // OK, we didn't find any special evaluation function for the current material
    // configuration. Is there a suitable specialized scaling function?