fix typo
Merge branch 'master' into modular

Conflicts:
	scss/lib/_mixins.scss