Merge remote branch 'cloudant:remove-couch_crypto'