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

Closes #59