Merging upstream master on GitHub