Merge branch 'master' into win32-x64-working

diff --cc include/extern.h
Simple merge

diff --cc src/do.c
Simple merge

diff --cc src/do_name.c
Simple merge

diff --cc src/dungeon.c
Simple merge