Merge "Merge remote-tracking branch 'couchbase/3.0.x' into sherlock" into sherlock
authorDave Rigby <daver@couchbase.com>
Fri, 17 Jun 2016 10:20:42 +0000 (10:20 +0000)
committerGerrit Code Review <gerrit@li94-158.members.linode.com>
Fri, 17 Jun 2016 10:20:42 +0000 (10:20 +0000)

Trivial merge