Update travis
Merge branch 'master' into ets-info