modify travis
updating tests
updating tests
updating tests
updating tests
updating tests
cleaning up
cleaning up
Merge remote-tracking branch 'origin/master' into 4.2