Splits mixins into separate imports, fixes import order.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into modular
1.0.0