Merge branch 'v4.8.x'

diff --cc args.h
Simple merge

diff --cc backend.c
Simple merge

diff --cc backend.h
Simple merge

diff --cc board.c
Simple merge

diff --cc common.h
Simple merge

diff --cc dialogs.c
Simple merge

diff --cc dialogs.h
Simple merge

diff --cc draw.c
Simple merge

diff --cc engineoutput.c
Simple merge

diff --cc frontend.h
Simple merge

diff --cc gtk/xboard.c
Simple merge

diff --cc gtk/xoptions.c
Simple merge

diff --cc gtk/xtimer.c
Simple merge

diff --cc menus.c
Simple merge

diff --cc moves.c
Simple merge

diff --cc moves.h
Simple merge

diff --cc parser.c
Simple merge

diff --cc parser.h
Simple merge

diff --cc pgntags.c
Simple merge

diff --cc winboard/defaults.h
Simple merge

diff --cc winboard/jaws.c
Simple merge

diff --cc winboard/winboard.c
Simple merge

diff --cc winboard/woptions.c
Simple merge

diff --cc winboard/wsettings.c
Simple merge

diff --cc xaw/xboard.c
Simple merge

diff --cc xaw/xoptions.c
Simple merge