Merge upstream master changes