A merge fix (https://bugs.launchpad.net/tarantool/+bug/1163858)