Merge-mark #1497

Job	Run time
build (gcc)	1m 57s
build (gcc, CFLAGS=-DTK_NO_DEPRECATED=1)	1m 41s
build (gcc, --disable-xft)	1m 56s
build (gcc, --disable-xss)	1m 39s
build (gcc, --enable-symbols)	1m 24s
build (clang)	1m 53s
build (clang, CFLAGS=-DTK_NO_DEPRECATED=1)	1m 50s
build (clang, --disable-xft)	2m 1s
build (clang, --disable-xss)	1m 56s
build (clang, --enable-symbols)	1m 22s
test (gcc)	4m 26s
test (gcc, --disable-xft)	4m 27s
test (gcc, --enable-symbols)	5m 32s
	32m 4s

Provide feedback