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

Conflicts:
	layers.rs