Merge pull request #1385 from rubenk/gcrypt-fix