Update libsodium version
Merge branch 'master' into autodetect-sodium-constants

Conflicts:
	tasks/sodium.rake