Couchbase Server

Bug to track trivial code merges