Merge branch 'oi/hipster', remote-tracking branch 'origin' into oi/hipster
Commit gnupg and related libs