Merge commit 'origin/stable'

Conflicts:

	tests/automake.mk

diff --cc src/language/stats/crosstabs.q
Simple merge

diff --cc src/ui/gui/main.c
Simple merge

diff --cc tests/automake.mk
Simple merge