Fixed a security issue with the encrypter
Merge.