Merge remote branch 'cloudant:couchdb-3293' This closes #155 Signed-off-by: ILYA Khlopotov <iilyak@apache.org>