Sync with 6.1.1

Signed-off-by: nppangband <nppangbanddev@verizon.net>