Merge branch 'travis' into tests