Merge Travis Integration to Upstream local branch