Fix Travis CI build
Merge branch 'master' into dynahack