Merge remote-tracking branch 'upstream/master'

diff --cc src/Makefile
Simple merge

diff --cc src/misc.cpp
Simple merge

diff --cc src/position.cpp
Simple merge

diff --cc src/ucioption.cpp
Simple merge