Fix for older couchdb version
Merge branch 'development' into livetest