Merge branch '3140-disable-queue-as-fifo-test' of https://github.com/wohali/couchdb-couch