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