Sync with upstream

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