Merge pull request #5400 from systemcrash/wg_pubkey