Merge remote-tracking branch 'couchbase/3.0.x' into sherlock