merged travis with upstream