fix a tiny typo
Merge branch 'master' into travis