Merge branch 'master' into core32

diff --cc core/comboot.inc
index 57e631e,cdba16d..079b476
--- 1/core/comboot.inc
--- 2/core/comboot.inc
+++ b/core/comboot.inc
@@@ -231,10 -219,10 +231,10 @@@ comboot_vectors
                dw comboot_err(3Eh)     ; INT 3E = DOS FPU emulation
                dw comboot_err(3Fh)     ; INT 3F = DOS overlay manager
  
 -              section .text
 +              section .text16
  
  ; INT 21h: generic DOS system call
- comboot_int21:        cli
+ comboot_int21:        sti
                push ds
                push es
                push fs
@@@ -306,8 -293,14 +305,8 @@@ comboot_exit
                xor cx,cx
  comboot_exit_msg:
                pop bx                  ; Return address
-               RESET_STACK_AND_SEGS SI ; Contains cld
+               RESET_STACK_AND_SEGS SI ; Contains sti, cld
                call adjust_screen      ; The COMBOOT program might have changed the screen
 -              pusha
 -              mov si,DOSSaveVectors
 -              mov di,4*20h
 -              mov cx,20h
 -              rep movsd               ; Restore DOS-range vectors
 -              popa
                jcxz .nomsg
                mov si,KernelCName
                call writestr