Merge pull request #1484 from alex/re-encode-thing

Upgrade the encryption algorithm on another thing. This uses the same PBES2 parameters as the previous one.