Fix typos introduced by previous commit
Merge branch 'master' into setup-travis