Fix Travis PR testing to not overwrite the "master" that Travis creates with our "upstream master" Upstream-commit: f9e14cc83884e246478c315964a2fcae03d5e8a8 Component: engine