Merging upstream master on Github