Issue #241

https://github.com/couchbase/couchbase-lite-java-core/issues/241
Merge pull request #245 from couchbase/feature/issue_241_rebased

Issue #241