Merging upstream master on github