Merge official-stockfish/master

diff --cc src/Makefile
index 041fff6,0998a55..bc452d1
--- 1/src/Makefile
--- 2/src/Makefile
+++ b/src/Makefile
@@@ -37,8 -37,8 +37,8 @@@ PGOBENCH = ./$(EXE) benc
  
  ### Object files
  OBJS = benchmark.o bitbase.o bitboard.o endgame.o evaluate.o main.o \
 -      material.o misc.o movegen.o movepick.o pawns.o position.o psqt.o \
 -      search.o thread.o timeman.o tt.o uci.o ucioption.o tune.o syzygy/tbprobe.o
 +      material.o misc.o movegen.o movepick.o partner.o parser.o pawns.o piece.o position.o psqt.o \
-       search.o thread.o timeman.o tt.o uci.o ucioption.o variant.o xboard.o syzygy/tbprobe.o
++      search.o thread.o timeman.o tt.o uci.o ucioption.o variant.o xboard.o tune.o syzygy/tbprobe.o
  
  ### Establish the operating system name
  KERNEL = $(shell uname -s)

diff --cc src/main.cpp
index 2b57302,6eeda66..1b66a17
--- 1/src/main.cpp
--- 2/src/main.cpp
+++ b/src/main.cpp
@@@ -39,10 -37,9 +39,11 @@@ int main(int argc, char* argv[]) 
  
    std::cout << engine_info() << std::endl;
  
 +  pieceMap.init();
 +  variants.init();
    UCI::init(Options);
+   Tune::init();
 -  PSQT::init();
 +  PSQT::init(variants.find(Options["UCI_Variant"])->second);
    Bitboards::init();
    Position::init();
    Bitbases::init();

diff --cc src/types.h
Simple merge