Merge 'master' into 'psppsheet'.
[pspp] / tests / ui /
drwxr-xr-x   ..
drwxr-xr-x - terminal