Merge pull request #1815 from rubenk/gcry-fixes-for-4.10