fix name
Merge branch 'master' into 1-travis-support