Merge PR by hand

https://github.com/couchbase/couchbase-lite-java-core/pull/196