Merge travis correction