Re-merge upstream master with the 3.5 fork