Sync with couchbase:master