Merge pull request #3115 from black-roland/libsodium