Move @lukefretwell's commits into sass.