Merge upstream/master into folsom