Merge branch 'master' of https://github.com/tarantool/tarantool

.travis.yml

CMakeLists.txt

cmake/BuildSophia.cmake

debian/rules

debian/tarantool-common.manpages

doc/user/configuration-reference.xml

extra/dist/dist.lua

src/CMakeLists.txt

src/box/alter.cc

src/box/box.cc

src/box/cluster.cc

src/box/cluster.h

src/box/engine_sophia.cc

src/box/engine_sophia.h

src/box/iproto.cc

src/box/log_io.cc

src/box/lua/load_cfg.lua

src/box/lua/slab.cc

src/box/lua/tuple.cc

src/box/lua/tuple.h