Updated branch syncing script [ci skip]
Disabled XDebug in Travis
Synced from master
Synced from master
Updated branch syncing script
Synced from master
Synced from master