Merge branch 'master' of https://vcs.fsf.org/git/enc