Merge branch 'couchdb-2992'

Closes #69