Merge upstream back into fork