CCBC-360
Merge branch 'master' of github.com:killgxlin/libcouchbase