Pull fastly changes into master