Add couchdb handler
Merge remote-tracking branch 'upstream/master' into couchdb
Merge remote-tracking branch 'Baachi/couchdb'
Docblock fix