Update master to match vigilant master