merge trunk #535

Job	Run time
build (gcc)	1m 41s
build (gcc, CFLAGS=-DTK_NO_DEPRECATED=1)	1m 53s
test (gcc)	3m 54s
build (gcc, --disable-shared)	1m 39s
test (gcc, --disable-xft)	3m 56s
build (gcc, --disable-xft)	1m 40s
build (gcc, --disable-xss)	1m 40s
test (gcc, --enable-symbols)	3m 38s
build (gcc, --enable-symbols)	1m 9s
build (clang)	1m 46s
build (clang, CFLAGS=-DTK_NO_DEPRECATED=1)	1m 49s
build (clang, --disable-shared)	1m 51s
build (clang, --disable-xft)	1m 54s
build (clang, --disable-xss)	1m 51s
build (clang, --enable-symbols)	1m 24s
	31m 45s

Provide feedback