Merge branch 'hotfix-2.2.35'
Merge branch 'hotfix-2.2.35'
Merge branch 'hotfix-2.2.36'
Merge branch 'master' of https://github.com/MISP/MISP
Fixed an incorrect check for the no PGP key warning condition partially responsible for #271
Merge branch 'hotfix-2.2.37' into develop