Merge upstream commits; move to master