Home GnuPG

Merge branch 'master' into nsis-3