Merge branch 'master' into update-couchdb-defaults