Merge remote-tracking branch 'remotes/origin/For2.2.2-Fix-Hourier' into For2.2.2...

diff --cc src/cmd/cmd-activate.c
Simple merge

diff --cc src/cmd/cmd-read.c
Simple merge

diff --cc src/cmd/cmd-spell.c
Simple merge

diff --cc src/cmd/cmd-zaprod.c
Simple merge

diff --cc src/market/building.c
Simple merge

diff --cc src/mind.c
Simple merge

diff --cc src/racial.c
Simple merge

diff --cc src/realm/realm-arcane.c
Simple merge

diff --cc src/realm/realm-craft.c
Simple merge

diff --cc src/realm/realm-death.c
Simple merge

diff --cc src/realm/realm-hissatsu.c
Simple merge

diff --cc src/realm/realm-life.c
Simple merge

diff --cc src/realm/realm-nature.c
Simple merge

diff --cc src/realm/realm-sorcery.c
Simple merge

diff --cc src/realm/realm-trump.c
Simple merge

diff --cc src/spells.h
Simple merge

diff --cc src/spells3.c
Simple merge

diff --cc src/targeting.c
Simple merge

diff --cc src/view/display-main-window.c
Simple merge

diff --cc src/wizard2.c
Simple merge