Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp