merge with mainline

diff --cc script/execute.c
Simple merge

diff --cc util/grub-script-check.c
index 550a56284c1b4e62eac18a1e8370499862311e54,ac59d5fcc10ada66c2fb91be10918f665a164aaa..4ca85c4bdad3f6d3e77dc49b471b9a80c55458f4
--- 1/util/grub-script-check.c
--- 2/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@@ -65,15 -65,6 +65,14 @@@ grub_script_break (grub_command_t cmd _
    return 0;
  }
  
- 
 +grub_err_t
 +grub_script_shift (grub_command_t cmd __attribute__((unused)),
 +                 int argc __attribute__((unused)),
 +                 char *argv[] __attribute__((unused)))
 +{
 +  return 0;
 +}
 +
  char *
  grub_script_execute_argument_to_string (struct grub_script_arg *arg __attribute__ ((unused)))
  {