[.travis.yml] Update.
Merge branch 'master' into docs