Merge branch 'arstrube/travis'