Merge branch 'NetHack-3.6'

diff --cc src/invent.c
Simple merge

diff --cc src/shk.c
Simple merge

diff --cc win/curses/cursmesg.c
Simple merge