Merge branch 'master' into gtk

Conflicts:
	backend.c

diff --cc backend.c
index 2574673,ca839ca..f881ba1
--- 1/backend.c
--- 2/backend.c
+++ b/backend.c
@@@ -4778,8 -4794,14 +4792,14 @@@ InitPosition(redraw
      case VariantShatranj:
        pieces = ShatranjArray;
        nrCastlingRights = 0;
 -      SetCharTable(pieceToChar, "PN.R.QB...Kpn.r.qb...k"); 
 +      SetCharTable(pieceToChar, "PN.R.QB...Kpn.r.qb...k");
        break;
+     case VariantMakruk:
+       pieces = makrukArray;
+       nrCastlingRights = 0;
+       startedFromSetupPosition = TRUE;
+       SetCharTable(pieceToChar, "PN.R.M....SKpn.r.m....sk"); 
+       break;
      case VariantTwoKings:
        pieces = twoKingsArray;
        break;
@@@ -7623,9 -7613,9 +7647,9 @@@ ApplyMove(fromX, fromY, toX, toY, promo
      }
  
    /* [HGM] In Shatranj and Courier all promotions are to Ferz */
-   if((gameInfo.variant==VariantShatranj || gameInfo.variant==VariantCourier)
+   if((gameInfo.variant==VariantShatranj || gameInfo.variant==VariantCourier || gameInfo.variant == VariantMakruk)
         && promoChar != 0) promoChar = PieceToChar(WhiteFerz);
 -         
 +
    if (fromX == toX && fromY == toY) return;
  
    if (fromY == DROP_RANK) {