Update for language changes
Merge remote branch 'origin/master-upgrade'

Conflicts:
	azure_hl.rs