merge with mainline

diff --cc Makefile.util.def
index b811b41015a9ddb1dca692c488a01a40f4629f63,79541b5edf228f9606be8d94c90afd0dc6aa9a3a..a3d5381d42c1318f26d3f72cdb12e700a1552277
--- 1/Makefile.util.def
--- 2/Makefile.util.def
+++ b/Makefile.util.def
@@@ -513,12 -513,12 +513,18 @@@ script = 
    common = tests/grub_script_setparams.in;
  };
  
+ script = {
+   testcase;
+   name = grub_script_return;
+   common = tests/grub_script_return.in;
+ };
+ 
 +script = {
 +  testcase;
 +  name = grub_cmd_regexp;
 +  common = tests/grub_cmd_regexp.in;
 +};
 +
  program = {
    testcase;
    name = example_unit_test;

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