Use https path to git modules, git:// doesn't always work behind a firewall
Merge branch 'stable'

Conflicts:
	.gitmodules
Merge branch 'master' of github.com:tarantool/tarantool