fixed travis.yml.. again
Merge branch 'master' into without-classpath

* master:
  fixed travis.yml.. again