Fix Travis CI
Fix typo
Merge branch 'master' into dynahack