Merge branch 'travis' into python3-tests