Update with GPG fixes