Use the new build env on Travis
Merge branch 'master' into lxml