Merge branch 'activesupport_parse_error' into random-iv-and-parse-error

* activesupport_parse_error:
  Adding support for newer versions of ActiveSupport due to ActiveSupport::JSON::ParseError being deprecated.
Merge branch 'random-iv-security' into random-iv-and-parse-error

* random-iv-security:
  Adding the ability to handle random IVs for security purposes