change the travis yml before script commands
Merge branch 'refs/heads/master' into 2.3