Update .travis.yml
Merge branch 'hotfix/update/20141019'