Merge Upstream master on github