Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme into ben/docs/2018-03