Fix environment variables declaration in travis.yml.
Merge remote-tracking branch 'origin/master'