Merge branch fix/couchdb_update_commit_things with refs/heads/master into...

Merge branch fix/couchdb_update_commit_things with refs/heads/master into refs/merge-requests/64/train
2 jobs for !64 with fix/couchdb_update_commit_things into master in 1 minute and 12 seconds (queued for 1 second)
merge train