Merge remote-tracking branch 'cloudant/couchdb-3302'

Closes #89