71892638 fix encrypted attribute options bug

Merge the latest from the community gem AND a bugfix submitted by a community member.