Merge remote-tracking branch 'origin/libs/scrypt/local'