Pushing cryptoScheme from the client into the save request
Merge remote-tracking branch 'origin/master' into Opera