Updated Travis script
Synced from master
Synced from master
Restored proper test suite in Travis
Synced from master
Synced from master