Merge official-stockfish/master

No functional change.

diff --cc src/bitboard.h
Simple merge

diff --cc src/evaluate.cpp
index 771ec3e,c042c01..f4f3904
--- 1/src/evaluate.cpp
--- 2/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@@ -304,13 -273,10 +304,13 @@@ namespace 
          // Find attacked squares, including x-ray attacks for bishops and rooks
          b = Pt == BISHOP ? attacks_bb<BISHOP>(s, pos.pieces() ^ pos.pieces(QUEEN))
            : Pt ==   ROOK ? attacks_bb<  ROOK>(s, pos.pieces() ^ pos.pieces(QUEEN) ^ pos.pieces(Us, ROOK))
 -                         : attacks_bb<Pt>(s, pos.pieces());
 +                         : pos.attacks_from(Us, Pt, s);
 +
 +        // Restrict mobility to actual squares of board
 +        b &= pos.board_bb(Us, Pt);
  
          if (pos.blockers_for_king(Us) & s)
-             b &= LineBB[pos.square<KING>(Us)][s];
+             b &= line_bb(pos.square<KING>(Us), s);
  
          attackedBy2[Us] |= attackedBy[Us][ALL_PIECES] & b;
          attackedBy[Us][Pt] |= b;