backed out having the Model take care of Encryption/Decryption for EncryptedFieldTypes.  Should probably have Caller take care of it
Merge branch 'origin/develop'