Merge branch 'master' of vcs.fsf.org:fai-configs