Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gnupg