Merge 9.1 #667

Job	Run time
build (gcc)	1m 49s
build (gcc, CFLAGS=-DTK_NO_DEPRECATED=1)	1m 46s
build (gcc, --disable-shared)	1m 46s
build (gcc, --disable-xft)	1m 57s
build (gcc, --disable-xss)	1m 48s
build (gcc, --enable-symbols)	1m 37s
build (clang)	2m 3s
build (clang, CFLAGS=-DTK_NO_DEPRECATED=1)	2m 23s
build (clang, --disable-shared)	2m 3s
build (clang, --disable-xft)	2m 18s
build (clang, --disable-xss)	2m 0s
test (gcc)	5m 0s
build (clang, --enable-symbols)	1m 28s
test (gcc, --disable-xft)	4m 26s
test (gcc, --enable-symbols)	4m 11s
	36m 35s

Provide feedback