removed gpg-agent plugin. done it manually
Merge remote-tracking branch 'upstream/master'