Merge Travis changes from unit-tests branch