Merge 'master' into 'psppsheet'.