Merge branch 'Nethack-3.7' into copperwater-autounlock-3.7

diff --cc doc/fixes37.0
Simple merge

diff --cc include/extern.h
Simple merge

diff --cc include/flag.h
Simple merge

diff --cc src/apply.c
Simple merge

diff --cc src/options.c
Simple merge

diff --cc src/pickup.c
Simple merge