fixes #8559
Merge branch '3.0.0-wip' into 3.0.0-sass-wip