Merge branch 'couchdb-2992'