Merge branch 'master'; commit 'origin/stable'

Conflicts:

	src/math/linreg.h
	src/ui/gui/psppire-data-editor.c

diff --cc src/data/sys-file-reader.c
Simple merge

diff --cc src/libpspp/str.c
Simple merge

diff --cc src/math/linreg.c
Simple merge