Merge 8.6 #1507

Job	Run time
build (gcc)	1m 43s
build (gcc, CFLAGS=-DTK_NO_DEPRECATED=1)	1m 42s
build (gcc, --disable-xft)	1m 42s
test (gcc)	4m 7s
build (gcc, --disable-xss)	1m 43s
test (gcc, --disable-xft)	4m 12s
build (gcc, --enable-symbols)	1m 16s
build (clang)	1m 47s
test (gcc, --enable-symbols)	3m 36s
build (clang, CFLAGS=-DTK_NO_DEPRECATED=1)	2m 0s
build (clang, --disable-xft)	1m 53s
build (clang, --disable-xss)	1m 48s
build (clang, --enable-symbols)	1m 25s
	28m 54s

Provide feedback