Merge branch 'master' of https://github.com/couchbaselabs/docs-ng into stage