Inherit type attributes from parent tracks.
Merge branch '0.12.x'

Conflicts:
	js/version.js