Merge 'master' into 'psppsheet'.

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

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

diff --cc src/ui/gui/aggregate-dialog.c
Simple merge

diff --cc src/ui/gui/chi-square-dialog.c
Simple merge

diff --cc src/ui/gui/count-dialog.c
Simple merge

diff --cc src/ui/gui/oneway-anova-dialog.c
Simple merge

diff --cc src/ui/gui/recode-dialog.c
Simple merge