Merge 8.6 #377

Job	Run time
build (gcc)	1m 41s
test (gcc)	3m 47s
build (gcc, CFLAGS=-DTK_NO_DEPRECATED=1)	1m 38s
test (gcc, --disable-xft)	3m 52s
build (gcc, --disable-xft)	1m 44s
test (gcc, --enable-symbols)	3m 20s
build (gcc, --disable-xss)	1m 37s
build (gcc, --enable-symbols)	1m 41s
build (clang)	1m 52s
build (clang, CFLAGS=-DTK_NO_DEPRECATED=1)	1m 49s
build (clang, --disable-xft)	2m 13s
build (clang, --disable-xss)	2m 11s
build (clang, --enable-symbols)	1m 26s
	28m 51s

Provide feedback