Travis now checks all branches
Merge branch 'ci' into ci-segfault-fix