Update API-CHANGES.txt
Merge branch 'upstream' into goodies

Conflicts:
	API-CHANGES.txt