Merge remote-tracking branch 'origin/stable'

Conflicts:
	src/admin.cc
	src/admin.rl
	src/box/bitset_index.cc
	src/box/hash_index.cc
	src/box/hash_index.h
	src/box/space.cc
	src/box/space.h
	test/box/admin.result