Update API-CHANGES.txt
Update CHANGELOG
Merge branch 'upstream' into ext-728

Conflicts:
	API-CHANGES.txt