Merge recent changes into NetHack-3.7

diff --cc README
index 952199fee102e31518934fd9b5048fd79873d63f,c73ec0a81b952de8a9fb88dca4eee3df3cdfd034..a3f43615eccf8fa76909120481386fb26133aed8
--- 1/README
--- 2/README
+++ b/README
@@@ -109,12 -74,11 +109,12 @@@ Please read items (1), (2) and (3) BEFO
          Intel Pentium or better (or clone) running Linux, BSDI, or
                  Windows (7 through 10)
          Intel 80386 or greater (or clone) boxes running Linux, or BSDI
-       Mac OS X 10.11 (follow the instructions in sys/unix, not sys/mac)
-       OpenVMS (aka VMS) V8.4 on Alpha and on Integrity/Itanium/IA64
+         Mac OS X 10.11 (follow the instructions in sys/unix, not sys/mac)
+         OpenVMS (aka VMS) V8.4 on Alpha and on Integrity/Itanium/IA64
  
      Instructions have been provided by way of community contribution on:
 -        msdos protected mode using djgpp
 +        msdos protected mode using djgpp including a Linux-host djgpp 
 +        cross-compile
  
      Previous versions of NetHack were tested and known to run on the
      following systems, but it is unknown if they can still build and

diff --cc include/patchlevel.h
Simple merge

diff --cc sys/vms/Install.vms
Simple merge