merge with mainline

diff --cc Makefile.util.def
Simple merge

diff --cc grub-core/Makefile.core.def
Simple merge

diff --cc grub-core/normal/menu.c
Simple merge

diff --cc grub-core/script/script.c
Simple merge

diff --cc grub-core/script/yylex.l
index 1a7084e,45728df..d4cad80
--- 1/grub-core/script/yylex.l
--- 2/grub-core/script/yylex.l
+++ b/grub-core/script/yylex.l
@@@ -169,7 -176,13 +176,12 @@@ MULTILINE       {WORD}?((\"{DQCHR}*)|(\
  "until"         { RECORD; return GRUB_PARSER_TOKEN_UNTIL;     }
  "while"         { RECORD; return GRUB_PARSER_TOKEN_WHILE;     }
  "function"      { RECORD; return GRUB_PARSER_TOKEN_FUNCTION;  }
 -"menuentry"     { RECORD; return GRUB_PARSER_TOKEN_MENUENTRY; }
  
+ {MULTILINE}     {
+                   if (grub_lexer_unput (yytext, yyscanner))
+                   return GRUB_PARSER_TOKEN_BAD;
+               }
+ 
  {NAME}          { RECORD; return GRUB_PARSER_TOKEN_NAME; }
  {WORD}          {
                    RECORD;

diff --cc include/grub/script_sh.h
Simple merge