Merge branch 'prerelease' into ditto
Merge branch 'ditto' of https://github.com/sqlcipher/sqlcipher into ditto