merge mainline into multiterm

diff --cc normal/main.c
index 0d70416122ff8aa4e1760f5ad51e6698bbb4e200,84162c08a5fc37e1ae431a8dc3b583fb5cfc51fa..739ad3763e6b9cfc77ac2b872f31e988ab39f34c
--- 1/normal/main.c
--- 2/normal/main.c
+++ b/normal/main.c
@@@ -441,9 -424,7 +441,8 @@@ read_lists (struct grub_env_var *var __
  {
    read_command_list ();
    read_fs_list ();
-   read_handler_list ();
    read_crypto_list ();
 +  read_terminal_list ();
    return val ? grub_strdup (val) : NULL;
  }