Merge 8.6 #375

Job	Run time
build (gcc)	1m 38s
test (gcc)	3m 46s
build (gcc, CFLAGS=-DTK_NO_DEPRECATED=1)	1m 42s
test (gcc, --disable-xft)	3m 52s
build (gcc, --disable-xft)	1m 39s
test (gcc, --enable-symbols)	3m 20s
build (gcc, --disable-xss)	1m 39s
build (gcc, --enable-symbols)	1m 17s
build (clang)	1m 50s
build (clang, CFLAGS=-DTK_NO_DEPRECATED=1)	1m 54s
build (clang, --disable-xft)	1m 51s
build (clang, --disable-xss)	1m 52s
build (clang, --enable-symbols)	1m 40s
	28m 0s

Provide feedback