71892638 sync encryptor with source

Merge the latest from the community gem.