Merge 8.7 #1041

Job	Run time
build (gcc)	2m 13s
test (gcc)	4m 14s
build (gcc, CFLAGS=-DTK_NO_DEPRECATED=1)	1m 38s
test (gcc, --disable-xft)	4m 19s
build (gcc, --disable-shared)	2m 22s
test (gcc, --enable-symbols)	3m 26s
build (gcc, --disable-xft)	1m 58s
build (gcc, --disable-xss)	1m 35s
build (gcc, --enable-symbols)	1m 18s
build (clang)	1m 49s
build (clang, CFLAGS=-DTK_NO_DEPRECATED=1)	1m 52s
build (clang, --disable-shared)	1m 48s
build (clang, --disable-xft)	1m 50s
build (clang, --disable-xss)	1m 49s
build (clang, --enable-symbols)	1m 53s
	34m 4s

Provide feedback