Merge branch 'NetHack-3.6'

diff --cc include/extern.h
Simple merge

diff --cc src/invent.c
Simple merge

diff --cc src/mkobj.c
Simple merge

diff --cc src/objnam.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/shk.c
Simple merge