Merge branch 'master' of github.com:couchbase/couchbase-lite-ios
Merge branch 'master' of github.com:mz2/couchbase-lite-ios