Undo previous hkp://pgp...:80 change due to high variance.
Merge branch 'dev' into 2.4