merge from gnupg.org