More travis tests.
Merge branch 'travis'