update travis-build to remove the fix ssl update
Merge branch 'master' into staging