Merge "Support non-ASCII GNUPGHOME environment variable"