Merge remote-tracking branch 'remotes/origin/upgradeApi'

Conflicts:
	api.php