Merge remote-tracking branch 'upstream/master'

diff --combined makefile
index e33d63e464534e2c8b3906231aa43171f0e5241d,6be0839602ae307db7a6f73902835dd40442a8cf..9da998721726f9f8cdfa147f2b5c809ce592721b
--- 1/makefile
--- 2/makefile
+++ b/makefile
@@@ -64,14 -64,13 +64,14 @@@ UPXQ=-qq
  AFLAGS=-mh -0 -d1
  16FLAGS=-fh=16.hed
  BAKAPIFLAGS=-fh=bakapi.hed
- SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k55808#60000#32768
+ SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k40000#55808#60000#32768
  DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
  ZFLAGS=-zk0 -zc -zp8 $(WCLQ) ## -zm
  CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo -i$(DOSLIB)##wwww
  OFLAGS=-obmiler -out -oh -ei -zp8 -fpi87  -onac -ol+ -ok####x
  FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
  
 +PCX2VRL=$(DOSLIBDIR)/hw/vga/pcx2vrl
  
  #DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
  VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
@@@ -433,8 -432,6 +433,6 @@@ clean: .symboli
        @$(REMOVECOMMAND) *.MAP
        @$(REMOVECOMMAND) *.map
        @$(REMOVECOMMAND) *.err
-       @$(COPYCOMMAND) .git$(DIRSEP)config git_con.fig
-       @$(COPYCOMMAND) .gitmodules git_modu.les
        @cd $(DOSLIB)
        #@./buildall.sh clean
        @cd $(PDIR)$(PDIR)$(PDIR)
@@@ -448,6 -445,10 +446,10 @@@
  #     @echo $(watcom)
  #     @echo $(INCLUDE)
  
+ backupconfig: .symbolic
+       @$(COPYCOMMAND) .git$(DIRSEP)config git_con.fig
+       @$(COPYCOMMAND) .gitmodules git_modu.les
+ 
  comp: .symbolic
        @upx -9 $(EXEC)