MB-7629: Merge branch 'master' of github.com:fulu/couchstore

Conflicts:
	src/btree_modify.c
Merge branch 'master' of github.com:fulu/couchstore