Merge branch 'ld/osx-keychain-usage-fix'

Workaround for a compiler warning against use of die() in osx-keychain (in contrib/). * ld/osx-keychain-usage-fix: osx-keychain: fix compiler warning