Solution for issue 10 from core
Merge branch 'master' of https://github.com/yaronyg/couchbase-lite-android-core