also test develop branch
Merge branch 'travis' into develop