merge upstream/master to fix Brackets #2522