Merge remote-tracking branch 'origin/master'

Conflicts:
	db/c.cc
	include/rocksdb/c.h