no more inherits, just inherit
Merge branch 'master' into release_1.5.0

Conflicts:
	sass/core/_element_defaults.scss