Merge branch 'master' of github.com:drewcrawford/libsodium-ios