merged r984501 from trunk

git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@984504 13f79535-47bb-0310-9956-ffa450edef68
1 file changed