Updated bundles
Updated Travis config [ci skip]
Synced from master
Synced from master