Merge branch 'xscreensaver-files'