merge with mainline

diff --cc Makefile.util.def
index 5f2295c3e49e6c53e13b2aa1e4d87b9416fc5acd,6dfd9301d81c0c3bcd0f5ee7cacf715a41f8475d..a0ab3d3d94d438343d95bc97305e8cb09cebe463
--- 1/Makefile.util.def
--- 2/Makefile.util.def
+++ b/Makefile.util.def
@@@ -501,12 -501,12 +501,18 @@@ script = 
    common = tests/grub_script_shift.in;
  };
  
+ script = {
+   testcase;
+   name = grub_script_blockarg;
+   common = tests/grub_script_blockarg.in;
+ };
+ 
 +script = {
 +  testcase;
 +  name = grub_script_return;
 +  common = tests/grub_script_return.in;
 +};
 +
  program = {
    testcase;
    name = example_unit_test;

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

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

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