Merge branch 'NetHack-3.7' into NetHack-3.7-Jan2020

diff --cc doc/Guidebook.mn
Simple merge

diff --cc doc/Guidebook.tex
Simple merge

diff --cc doc/fixes37.0
Simple merge

diff --cc src/options.c
Simple merge

diff --cc src/windows.c
Simple merge