Fixes typo
Merge branch 'master' into 3.0
Fixes .travis.yml
Merge branch '3.0' into 4.0-devel